Adwaita: button fixes

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2f81d4793d8b5eacd3743e3abbf2db2876341c42..fde7be849b31a57b1b9350b8ed4cce9dc64c4b4e 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -264,7 +264,7 @@ entry, spinbutton {
   .linked:not(.vertical) > & { @extend %linked; }
 
   .linked:not(.vertical) > &:focus + entry,
-  .linked:not(.vertical) > &:focus + .button,
+  .linked:not(.vertical) > &:focus + button,
   .linked:not(.vertical) > &:focus + GtkComboBox > .the-button-in-the-combobox,
   .linked:not(.vertical) > &:focus + GtkComboBoxText > .the-button-in-the-combobox {
     border-left-color: entry_focus_border(); // colors the border of the widget following a focused entry
@@ -330,7 +330,7 @@ entry, spinbutton {
   // this takes care of coloring the top border of the focused entry subsequent widget.
   // :not(:only-child) is a specificity bump hack.
   > entry:focus:not(:only-child) + entry,
-  > entry:focus:not(:only-child) + .button,
+  > entry:focus:not(:only-child) + button,
   > entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
   > entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: entry_focus_border(); }
 }
@@ -360,8 +360,7 @@ $_dot_color: if($variant=='light', $selected_bg_color,
   }
 }
 
-button,
-.button {
+button {
 
   $_button_transition: all 200ms $ease-out-quad;
 
@@ -637,7 +636,7 @@ button,
 
 // all the following is for the +|- buttons on inline toolbars, that way
 // should really be deprecated...
-.inline-toolbar GtkToolButton > .button { // redefining the button look is
+.inline-toolbar GtkToolButton > button { // redefining the button look is
                                           // needed since those are flat...
   @include button(normal);
   &:hover { @include button(hover); }
@@ -658,10 +657,10 @@ button,
 // More inline toolbar buttons
 .inline-toolbar.toolbar GtkToolButton,
 .inline-toolbar.toolbar GtkToolButton:backdrop {
-  & > .button.flat { @extend %linked_middle; }
-  &:first-child > .button.flat { @extend %linked:first-child; }
-  &:last-child > .button.flat { @extend %linked:last-child; }
-  &:only-child > .button.flat { @extend %linked:only-child; }
+  & > button.flat { @extend %linked_middle; }
+  &:first-child > button.flat { @extend %linked:first-child; }
+  &:last-child > button.flat { @extend %linked:last-child; }
+  &:only-child > button.flat { @extend %linked:only-child; }
 }
 
 %linked_middle {
@@ -769,7 +768,7 @@ GtkColorButton.button {
   }
 }
 
-.button:link, .button:visited {
+button:link, button:visited {
   @extend %undecorated_button;
   @extend *:link;
   text-shadow: none;
@@ -963,7 +962,7 @@ GtkComboBox {
       border-bottom-left-radius: 0;
     }
   }
-  &.combobox-entry .button {
+  &.combobox-entry button {
     &:dir(ltr) {
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
@@ -1124,7 +1123,7 @@ GtkComboBox {
 
     .subtitle:link { @extend *:link:selected;  }
 
-    .button {
+    button {
       @include button(normal, $selected_bg_color, $selected_fg_color, $_hc);
 
       &.flat { @include button(undecorated); }
@@ -1226,7 +1225,7 @@ GtkComboBox {
 
   &.default-decoration {
     padding: 4px;
-    .button { padding: 5px; }
+    button { padding: 5px; }
   }
 }
 
@@ -1234,7 +1233,7 @@ GtkComboBox {
  * Pathbars *
  ************/
 
-.path-bar .button {
+.path-bar button {
   padding: 5px 6px 6px;
   &:first-child { padding-left: 8px; }
   &:last-child { padding-right: 8px; }
@@ -1373,7 +1372,7 @@ GtkTreeView.view {
 }
 
 column-header {
-  .button {
+  button {
     @extend %column_header_button;
     $_column_header_color: mix($fg_color, $base_color, 50%);
     color: $_column_header_color;
@@ -1396,10 +1395,10 @@ column-header {
       @extend column-header.button.dnd;
     }
   }
-  & .button:last-child,
-  & .button:last-child:backdrop, // set :backdrop too or the border will be visibile there
-  &:last-child.button,
-  &:last-child.button:backdrop { //treeview-like derived widgets in Banshee and Evolution
+  & button:last-child,
+  & button:last-child:backdrop, // set :backdrop too or the border will be visibile there
+  &:last-child button,
+  &:last-child button:backdrop { //treeview-like derived widgets in Banshee and Evolution
     border-right-style: none;
   }
 }
@@ -1486,7 +1485,7 @@ column-header.button.dnd { // for treeview-like derive widgets
     &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
     &.arrow:dir(rtl) {-gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); }
   }
-  &.button { // overlow buttons
+  & button { // overlow buttons
     @extend %undecorated_button;
     border-style: none;
     border-radius: 0;
@@ -1528,8 +1527,8 @@ column-header.button.dnd { // for treeview-like derive widgets
     background-color: transparent;
   }
 
-  .button.flat,
-  .button.flat:hover {
+  button.flat,
+  button.flat:hover {
     text-shadow: none;
     transition: none;
   }
@@ -1752,7 +1751,7 @@ notebook {
       color: $fg_color;
       &:backdrop { color: $backdrop_fg_color; }
     }
-    .button { //tab close button
+    button { //tab close button
       padding: 0;
       border: 1px solid transparent;
       @extend %undecorated_button;
@@ -1811,7 +1810,7 @@ notebook {
   $_slider_margin: 3px;
   $_slider_fine_tune_margin: 4px;
 
-  .button {
+  button {
     border: none;
   }
 
@@ -2081,7 +2080,7 @@ switch {
       -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}#{$asset_suffix}.png"),
                                     url("assets/#{$a}#{$as}#{$asset_suffix}@2.png"));
       icon-shadow: if(str-index($s,"backdrop"), none, 0 1px 0 $borders_edge); //no edge highlight for :backdrop
-      &.button.flat { icon-shadow: none; }
+      & button.flat { icon-shadow: none; }
     }
     @if $variant == 'light' {
       // the borders of the light variant versions of checks and radios are
@@ -2560,7 +2559,7 @@ separator {
 
 .list-row:selected {
   @extend %selected_items;
-  .button {
+  button {
     @include button(normal, $edge:none);
     @if $variant == 'light' { border-color: $selected_borders_color; }
     &.flat {
@@ -2627,7 +2626,7 @@ separator {
                                                transparent 2px);
   background-clip: padding-box;
   &:backdrop { background-image: none; }
-  .button {
+  button {
     @include button(osd);
     &.flat {
       @extend %undecorated_button;
@@ -2718,7 +2717,7 @@ calendar {
  * Dialogs *
  ***********/
 
-.message-dialog .dialog-action-area .button {
+.message-dialog .dialog-action-area button {
   padding: 8px;
 }
 
@@ -2738,7 +2737,7 @@ calendar {
       border-bottom-left-radius: 9px;
       border-bottom-right-radius: 9px;
     }
-    .dialog-action-area .button {
+    .dialog-action-area button {
       padding: 12px;
       border-radius: 0;
       @include button(normal, $edge:none);
@@ -2887,7 +2886,7 @@ GtkPlacesSidebar.sidebar {
 
     &.image-button { padding: 5px; }
 
-    @extend .button.flat;
+    @extend button.flat;
     border-radius: 100%;
     outline-radius: 100%;
     &:not(:hover):not(:active) > image,
@@ -2978,7 +2977,7 @@ infobar {
   color: $selected_fg_color;
   text-shadow: 0 1px darken($selected_bg_color, 10%);
   border-color: darken($selected_bg_color, 10%);
-  .button {
+  button {
     // FIXME: extend selection mode buttons
     @include button(normal, $selected_bg_color, $selected_fg_color, none);
     &:hover {
@@ -3182,13 +3181,13 @@ GtkColorSwatch {
 
    .osd & { @extend %osd; }
 
-   .osd & .button.flat {  //FIXME: quick hack, redo properly
+   .osd & button.flat {  //FIXME: quick hack, redo properly
      padding: 6px;
      border-style: none;
      border-radius: 5px;
    }
 
-  .button { // +/- buttons on GtkVolumeButton popup
+  button { // +/- buttons on GtkVolumeButton popup
     padding: 6px;
     &:hover {
       @extend %undecorated_button;
@@ -3207,7 +3206,7 @@ GtkVolumeButton.button {
   // with the image-button/text-button classes automagically applied depending on the button child these selectors can be deleted.
   @extend .image-button;
 
-  &.text-button { @extend .text-button }
+  &.text-button { @extend button.text-button }
 }
 
 /**********************
@@ -3272,17 +3271,17 @@ decoration {
 }
 
 // Window Close button
-.header-bar .button.titlebutton,
-.titlebar .button.titlebutton {
-  @extend .button;
-  @extend .button.flat;
+.header-bar button.titlebutton,
+.titlebar button.titlebutton {
+  @extend button;
+  @extend button.flat;
   @extend .image-button;
   @include _button_text_shadow;
   &:backdrop { icon-shadow: none; }
 }
 
-.header-bar.selection-mode .button.titlebutton,
-.titlebar.selection-mode .button.titlebutton {
+.header-bar.selection-mode button.titlebutton,
+.titlebar.selection-mode button.titlebutton {
   @include _button_text_shadow(white, $selected_bg_color);
   &:backdrop { icon-shadow: none; }
 }
@@ -3359,7 +3358,7 @@ entry.cursor-handle,
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black;
   &:backdrop { text-shadow: none; }
-  .button {
+  button {
     @include button(osd);
     &:hover { @include button(osd-hover); }
     &:active, &:checked { @include button(osd-active); }
@@ -3431,12 +3430,12 @@ entry.cursor-handle,
   }
 }
 
-.button.circular {
+button.circular {
   border-radius: 20px;
   outline-radius: 20px;
 }
 
-.button.circular label {
+button.circular label {
   padding: 0;
 }
 

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index d70a927b5382ac0116ea06f994bf3c7d1cc9f764..3de9b7c4ef3a84e0f1a36b8647a1a13e88308470 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -36,7 +36,7 @@
   .background:backdrop {
     text-shadow: none;
     icon-shadow: none;
-    color: #939695;
+    color: #949796;
     background-color: #393f3f; }
 
 /*
@@ -58,8 +58,8 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:insensitive {
-    background-color: #323636;
-    color: #939695; }
+    background-color: #333636;
+    color: #949796; }
   .gtkstyle-fallback:selected {
     background-color: #215d9c;
     color: #ffffff; }
@@ -68,7 +68,7 @@
   color: white;
   background-color: #292929; }
   .view:backdrop {
-    color: #d4d4d4;
+    color: #d5d5d5;
     background-color: #2c2c2c; }
   .view:selected, calendar:selected {
     border-radius: 3px; }
@@ -80,9 +80,9 @@
 label.separator {
   color: #eeeeec; }
   label.separator:backdrop {
-    color: #939695; }
+    color: #949796; }
 label:insensitive {
-  color: #939695; }
+  color: #949796; }
   label:insensitive:backdrop {
     color: #5d6767; }
 
@@ -100,18 +100,18 @@ assistant .sidebar {
     border-left: 1px solid #1c1f1f; }
   assistant .sidebar:backdrop {
     background-color: #2c2c2c;
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #5d6261; }
+  background-color: #5d6262; }
 
 GtkTextView {
   background-color: #313434; }
   GtkTextView:backdrop {
-    background-color: #323535; }
+    background-color: #333636; }
 
 .grid-child {
   padding: 3px;
@@ -158,7 +158,7 @@ entry, spinbutton {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: transparent;
-  background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+  background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
   color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -171,7 +171,7 @@ entry, spinbutton {
   entry.flat, entry.flat:focus, spinbutton.flat, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0);
@@ -179,29 +179,29 @@ entry, spinbutton {
     border-radius: 0; }
   entry:focus, spinbutton:focus {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     box-shadow: inset 0 0 0 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1);
     border-color: #0f2b48; }
   entry:insensitive, spinbutton:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-    color: #939695;
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-    color: #d4d4d4;
-    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    color: #d5d5d5;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry:backdrop:insensitive, spinbutton:backdrop:insensitive {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry progress, spinbutton progress {
     margin: 1px;
@@ -214,14 +214,14 @@ entry, spinbutton {
     box-shadow: none; }
     entry progress:backdrop, spinbutton progress:backdrop {
       background-color: transparent; }
-  .linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > entry:focus + .button, .linked:not(.vertical) > entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > entry:focus + GtkComboBoxText > .the-button-in-the-combobox, .linked:not(.vertical) > spinbutton:focus + entry, .linked:not(.vertical) > spinbutton:focus + .button, .linked:not(.vertical) > spinbutton:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > spinbutton:focus + GtkComboBoxText > .the-button-in-the-combobox {
+  .linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > entry:focus + GtkComboBoxText > .the-button-in-the-combobox, .linked:not(.vertical) > spinbutton:focus + entry, .linked:not(.vertical) > spinbutton:focus + button, .linked:not(.vertical) > spinbutton:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > spinbutton:focus + GtkComboBoxText > .the-button-in-the-combobox {
     border-left-color: #0f2b48; }
   entry.error, spinbutton.error {
     color: #cc0000;
     border-color: #1a0000; }
     entry.error:focus, spinbutton.error:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(238, 238, 236, 0.1);
       border-color: #1a0000; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
@@ -231,22 +231,22 @@ entry, spinbutton {
     border-color: #432100; }
     entry.warning:focus, spinbutton.warning:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(238, 238, 236, 0.1);
       border-color: #432100; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
   entry image, spinbutton image {
-    color: #c6c6c5; }
+    color: #c7c7c5; }
     entry image:hover, spinbutton image:hover {
       color: #eeeeec; }
     entry image:active, spinbutton image:active {
       color: #215d9c; }
     entry image:backdrop, spinbutton image:backdrop {
-      color: #7e8080; }
+      color: #7f8281; }
   .osd entry, .osd spinbutton {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -256,7 +256,7 @@ entry, spinbutton {
     icon-shadow: 0 1px black; }
     .osd entry:focus, .osd spinbutton:focus {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       color: white;
       border-color: #215d9c;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -266,7 +266,7 @@ entry, spinbutton {
       icon-shadow: 0 1px black; }
     .osd entry:backdrop, .osd spinbutton:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -276,10 +276,10 @@ entry, spinbutton {
       icon-shadow: none; }
     .osd entry:insensitive, .osd spinbutton:insensitive {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-      color: #878989;
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -293,7 +293,7 @@ entry, spinbutton {
   border-top-color: #252626;
   background-image: linear-gradient(to bottom, #292929); }
   .linked.vertical > entry:not(:insensitive) + entry:not(:insensitive):backdrop {
-    border-top-color: #272929;
+    border-top-color: #282929;
     background-image: linear-gradient(to bottom, #2c2c2c); }
 .linked.vertical > entry + entry:focus:not(:last-child) {
   border-top-color: #0f2b48;
@@ -301,7 +301,7 @@ entry, spinbutton {
 .linked.vertical > entry + entry:focus:last-child {
   border-top-color: #0f2b48; }
 .linked.vertical > entry:focus:not(:only-child) + entry,
-.linked.vertical > entry:focus:not(:only-child) + .button,
+.linked.vertical > entry:focus:not(:only-child) + button,
 .linked.vertical > entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
 .linked.vertical > entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
   border-top-color: #0f2b48; }
@@ -314,10 +314,8 @@ entry, spinbutton {
     background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#3583d5), to(transparent)); }
   to {
     background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#215d9c), to(transparent)); } }
-button,
-.button,
-.header-bar .button.titlebutton,
-.titlebar .button.titlebutton {
+button, .header-bar button.titlebutton,
+.titlebar button.titlebutton {
   border: 1px solid;
   border-radius: 3px;
   padding: 5px 8px 6px;
@@ -329,11 +327,8 @@ button,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  button.flat,
-  .button.flat,
-  .sidebar-button.button,
-  .header-bar .titlebutton.button,
-  .titlebar .titlebutton.button {
+  button.flat, .sidebar-button.button, .header-bar button.titlebutton,
+  .titlebar button.titlebutton {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -341,23 +336,15 @@ button,
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    button.flat:hover,
-    .button.flat:hover,
-    .sidebar-button.button:hover,
-    .header-bar .titlebutton.button:hover,
-    .titlebar .titlebutton.button:hover {
+    button.flat:hover, .sidebar-button.button:hover, .header-bar button.titlebutton:hover,
+    .titlebar button.titlebutton:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      button.flat:hover:active,
-      .button.flat:hover:active,
-      .sidebar-button.button:hover:active,
-      .header-bar .titlebutton.button:hover:active,
-      .titlebar .titlebutton.button:hover:active {
+      button.flat:hover:active, .sidebar-button.button:hover:active, .header-bar button.titlebutton:hover:active,
+      .titlebar button.titlebutton:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  button:hover,
-  .button:hover,
-  .header-bar .button.titlebutton:hover,
-  .titlebar .button.titlebutton:hover {
+  button:hover, .header-bar button.titlebutton:hover,
+  .titlebar button.titlebutton:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -366,13 +353,9 @@ button,
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
     -gtk-image-effect: highlight; }
-  button:active, button:checked,
-  .button:active,
-  .header-bar .button.titlebutton:active,
-  .titlebar .button.titlebutton:active,
-  .button:checked,
-  .header-bar .button.titlebutton:checked,
-  .titlebar .button.titlebutton:checked {
+  button:active, .header-bar button.titlebutton:active,
+  .titlebar button.titlebutton:active, button:checked, .header-bar button.titlebutton:checked,
+  .titlebar button.titlebutton:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -381,129 +364,80 @@ button,
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1);
     transition-duration: 50ms; }
-  button:backdrop, button.flat:backdrop,
-  .button:backdrop,
-  .header-bar .button.titlebutton:backdrop,
-  .titlebar .button.titlebutton:backdrop,
-  .button.flat:backdrop,
-  .sidebar-button.button:backdrop,
-  .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+  button:backdrop, .header-bar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop {
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     -gtk-image-effect: none; }
-    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.flat:backdrop:checked,
-    .button:backdrop:active,
-    .button:backdrop:checked,
-    .button.flat:backdrop:active,
-    .sidebar-button.button:backdrop:active,
-    .header-bar .titlebutton.button:backdrop:active,
-    .titlebar .titlebutton.button:backdrop:active,
-    .button.flat:backdrop:checked,
-    .sidebar-button.button:backdrop:checked,
-    .header-bar .titlebutton.button:backdrop:checked,
-    .titlebar .titlebutton.button:backdrop:checked {
-      color: #939695;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #2f3434);
+    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, .sidebar-button.button:backdrop:active, .header-bar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, .sidebar-button.button:backdrop:checked, .header-bar button.titlebutton:backdrop:checked,
+    .titlebar button.titlebutton:backdrop:checked {
+      color: #949796;
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-    button:backdrop:insensitive, button.flat:backdrop:insensitive,
-    .button:backdrop:insensitive,
-    .button.flat:backdrop:insensitive,
-    .sidebar-button.button:backdrop:insensitive,
-    .header-bar .titlebutton.button:backdrop:insensitive,
-    .titlebar .titlebutton.button:backdrop:insensitive {
+    button:backdrop:insensitive, button.flat:backdrop:insensitive, .sidebar-button.button:backdrop:insensitive, .header-bar button.titlebutton:backdrop:insensitive,
+    .titlebar button.titlebutton:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #323636);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label,
-      .button:backdrop:insensitive > .label,
-      .button.flat:backdrop:insensitive > .label,
-      .sidebar-button.button:backdrop:insensitive > .label,
-      .header-bar .titlebutton.button:backdrop:insensitive > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive > .label {
+      button:backdrop:insensitive > .label, .header-bar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, .sidebar-button.button:backdrop:insensitive > .label, .header-bar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, button.flat:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked,
-    .button:backdrop:insensitive:active,
-    .button:backdrop:insensitive:checked,
-    .button.flat:backdrop:insensitive:active,
-    .sidebar-button.button:backdrop:insensitive:active,
-    .header-bar .titlebutton.button:backdrop:insensitive:active,
-    .titlebar .titlebutton.button:backdrop:insensitive:active,
-    .button.flat:backdrop:insensitive:checked,
-    .sidebar-button.button:backdrop:insensitive:checked,
-    .header-bar .titlebutton.button:backdrop:insensitive:checked,
-    .titlebar .titlebutton.button:backdrop:insensitive:checked {
+    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, button.flat:backdrop:insensitive:active, .sidebar-button.button:backdrop:insensitive:active, .header-bar button.titlebutton:backdrop:insensitive:active,
+    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, .sidebar-button.button:backdrop:insensitive:checked, .header-bar button.titlebutton:backdrop:insensitive:checked,
+    .titlebar button.titlebutton:backdrop:insensitive:checked {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #262929);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #272929);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, button.flat:backdrop:insensitive:checked > .label,
-      .button:backdrop:insensitive:active > .label,
-      .button:backdrop:insensitive:checked > .label,
-      .button.flat:backdrop:insensitive:active > .label,
-      .sidebar-button.button:backdrop:insensitive:active > .label,
-      .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive:active > .label,
-      .button.flat:backdrop:insensitive:checked > .label,
-      .sidebar-button.button:backdrop:insensitive:checked > .label,
-      .header-bar .titlebutton.button:backdrop:insensitive:checked > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
+      button:backdrop:insensitive:active > .label, .header-bar button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > .label, .header-bar button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button.flat:backdrop:insensitive:checked > .label, .sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
-  button.flat:backdrop, button.flat:insensitive, button.flat:backdrop:insensitive,
-  .button.flat:backdrop,
-  .sidebar-button.button:backdrop,
-  .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop,
-  .button.flat:insensitive,
-  .sidebar-button.button:insensitive,
-  .header-bar .titlebutton.button:insensitive,
-  .titlebar .titlebutton.button:insensitive,
-  .button.flat:backdrop:insensitive,
-  .sidebar-button.button:backdrop:insensitive,
-  .header-bar .titlebutton.button:backdrop:insensitive,
-  .titlebar .titlebutton.button:backdrop:insensitive {
+  button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:insensitive, .sidebar-button.button:insensitive, .header-bar button.titlebutton:insensitive,
+  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, .sidebar-button.button:backdrop:insensitive, .header-bar button.titlebutton:backdrop:insensitive,
+  .titlebar button.titlebutton:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     icon-shadow: none; }
-  button:insensitive,
-  .button:insensitive,
-  .header-bar .button.titlebutton:insensitive,
-  .titlebar .button.titlebutton:insensitive {
-    color: #939695;
+  button:insensitive, .header-bar button.titlebutton:insensitive,
+  .titlebar button.titlebutton:insensitive {
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-    button:insensitive > .label,
-    .button:insensitive > .label {
+    button:insensitive > .label, .header-bar button.titlebutton:insensitive > .label,
+    .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
-    button:insensitive:active, button:insensitive:checked,
-    .button:insensitive:active,
-    .button:insensitive:checked {
-      color: #939695;
+    button:insensitive:active, button:insensitive:checked {
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #2f3333, #323636);
+      background-image: linear-gradient(to bottom, #313434, #333636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      button:insensitive:active > .label, button:insensitive:checked > .label,
-      .button:insensitive:active > .label,
-      .button:insensitive:checked > .label {
+      button:insensitive:active > .label, .header-bar button.titlebutton:insensitive:active > .label,
+      .titlebar button.titlebutton:insensitive:active > .label, button:insensitive:checked > .label, .header-bar button.titlebutton:insensitive:checked > .label,
+      .titlebar button.titlebutton:insensitive:checked > .label {
         color: inherit; }
-  button.osd,
-  .button.osd,
-  .header-bar .osd.button.titlebutton,
-  .titlebar .osd.button.titlebutton {
+  button.osd, .header-bar button.osd.titlebutton,
+  .titlebar button.osd.titlebutton {
     color: #eeeeec;
     border-radius: 5px;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -517,16 +451,10 @@ button,
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-    button.osd.image-button, .header-bar button.osd.titlebutton.button,
-    .titlebar button.osd.titlebutton.button,
-    .button.osd.image-button,
-    GtkScaleButton.button.osd,
-    GtkVolumeButton.button.osd,
-    .header-bar .osd.titlebutton.button,
-    .titlebar .osd.titlebutton.button {
+    button.osd.image-button, .header-bar button.osd.titlebutton,
+    .titlebar button.osd.titlebutton {
       padding: 13px; }
-    button.osd:hover,
-    .button.osd:hover {
+    button.osd:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -537,9 +465,7 @@ button,
       outline-color: rgba(238, 238, 236, 0.3);
       border: none;
       box-shadow: none; }
-    button.osd:active, button.osd:checked,
-    .button.osd:active,
-    .button.osd:checked {
+    button.osd:active, button.osd:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -550,19 +476,16 @@ button,
       outline-color: rgba(238, 238, 236, 0.3);
       border: none;
       box-shadow: none; }
-    button.osd:insensitive, button.osd:backdrop:insensitive,
-    .button.osd:insensitive,
-    .button.osd:backdrop:insensitive {
-      color: #878989;
+    button.osd:insensitive, button.osd:backdrop:insensitive {
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
       border: none; }
-    button.osd:backdrop,
-    .button.osd:backdrop {
+    button.osd:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -571,10 +494,9 @@ button,
       text-shadow: none;
       icon-shadow: none;
       border: none; }
-  .osd button, .osd
-  .button, .osd .header-bar .button.titlebutton, .header-bar .osd .button.titlebutton,
-  .osd .titlebar .button.titlebutton,
-  .titlebar .osd .button.titlebutton {
+  .osd button, .osd .header-bar button.titlebutton, .header-bar .osd button.titlebutton,
+  .osd .titlebar button.titlebutton,
+  .titlebar .osd button.titlebutton {
     color: #eeeeec;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -583,8 +505,7 @@ button,
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button:hover, .osd
-    .button:hover {
+    .osd button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -593,11 +514,7 @@ button,
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button:active, .osd button:checked, .osd button:backdrop:active, .osd button:backdrop:checked, .osd
-    .button:active, .osd
-    .button:checked, .osd
-    .button:backdrop:active, .osd
-    .button:backdrop:checked {
+    .osd button:active, .osd button:checked, .osd button:backdrop:active, .osd button:backdrop:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -606,18 +523,15 @@ button,
       text-shadow: none;
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button:insensitive, .osd button:backdrop:insensitive, .osd
-    .button:insensitive, .osd
-    .button:backdrop:insensitive {
-      color: #878989;
+    .osd button:insensitive, .osd button:backdrop:insensitive {
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd button:backdrop, .osd
-    .button:backdrop {
+    .osd button:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -625,11 +539,9 @@ button,
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd button.flat, .osd
-    .button.flat, .osd
-    .sidebar-button.button, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
-    .osd .titlebar .titlebutton.button,
-    .titlebar .osd .titlebutton.button {
+    .osd button.flat, .osd .sidebar-button.button, .osd .header-bar button.titlebutton, .header-bar .osd button.titlebutton,
+    .osd .titlebar button.titlebutton,
+    .titlebar .osd button.titlebutton {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -639,11 +551,9 @@ button,
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd button.flat:hover, .osd
-      .button.flat:hover, .osd
-      .sidebar-button.button:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
-      .osd .titlebar .titlebutton.button:hover,
-      .titlebar .osd .titlebutton.button:hover {
+      .osd button.flat:hover, .osd .sidebar-button.button:hover, .osd .header-bar button.titlebutton:hover, .header-bar .osd button.titlebutton:hover,
+      .osd .titlebar button.titlebutton:hover,
+      .titlebar .osd button.titlebutton:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -655,14 +565,12 @@ button,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:insensitive, .osd
-      .button.flat:insensitive, .osd
-      .sidebar-button.button:insensitive, .osd .header-bar .titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
-      .osd .titlebar .titlebutton.button:insensitive,
-      .titlebar .osd .titlebutton.button:insensitive {
-        color: #878989;
+      .osd button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd .header-bar button.titlebutton:insensitive, .header-bar .osd button.titlebutton:insensitive,
+      .osd .titlebar button.titlebutton:insensitive,
+      .titlebar .osd button.titlebutton:insensitive {
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -670,26 +578,20 @@ button,
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:backdrop, .osd
-      .button.flat:backdrop, .osd
-      .sidebar-button.button:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
-      .osd .titlebar .titlebutton.button:backdrop,
-      .titlebar .osd .titlebutton.button:backdrop {
+      .osd button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd .header-bar button.titlebutton:backdrop, .header-bar .osd button.titlebutton:backdrop,
+      .osd .titlebar button.titlebutton:backdrop,
+      .titlebar .osd button.titlebutton:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.flat:active, .osd button.flat:checked, .osd
-      .button.flat:active, .osd
-      .sidebar-button.button:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
-      .osd .titlebar .titlebutton.button:active,
-      .titlebar .osd .titlebutton.button:active, .osd
-      .button.flat:checked, .osd
-      .sidebar-button.button:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
-      .osd .titlebar .titlebutton.button:checked,
-      .titlebar .osd .titlebutton.button:checked {
+      .osd button.flat:active, .osd .sidebar-button.button:active, .osd .header-bar button.titlebutton:active, .header-bar .osd button.titlebutton:active,
+      .osd .titlebar button.titlebutton:active,
+      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd .sidebar-button.button:checked, .osd .header-bar button.titlebutton:checked, .header-bar .osd button.titlebutton:checked,
+      .osd .titlebar button.titlebutton:checked,
+      .titlebar .osd button.titlebutton:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -701,10 +603,8 @@ button,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-  button.suggested-action,
-  .button.suggested-action,
-  .header-bar .suggested-action.button.titlebutton,
-  .titlebar .suggested-action.button.titlebutton {
+  button.suggested-action, .header-bar button.suggested-action.titlebutton,
+  .titlebar button.suggested-action.titlebutton {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #0b1e33;
@@ -712,11 +612,8 @@ button,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    button.suggested-action.flat,
-    .button.suggested-action.flat,
-    .suggested-action.sidebar-button.button,
-    .header-bar .suggested-action.titlebutton.button,
-    .titlebar .suggested-action.titlebutton.button {
+    button.suggested-action.flat, .suggested-action.sidebar-button.button, .header-bar button.suggested-action.titlebutton,
+    .titlebar button.suggested-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -724,8 +621,7 @@ button,
       text-shadow: none;
       icon-shadow: none;
       color: #215d9c; }
-    button.suggested-action:hover,
-    .button.suggested-action:hover {
+    button.suggested-action:hover {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0b1e33;
@@ -733,9 +629,7 @@ button,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    button.suggested-action:active, button.suggested-action:checked,
-    .button.suggested-action:active,
-    .button.suggested-action:checked {
+    button.suggested-action:active, button.suggested-action:checked {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0b1e33;
@@ -743,92 +637,50 @@ button,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); }
-    button.suggested-action:backdrop, button.suggested-action.flat:backdrop,
-    .button.suggested-action:backdrop,
-    .button.suggested-action.flat:backdrop,
-    .suggested-action.sidebar-button.button:backdrop,
-    .header-bar .suggested-action.titlebutton.button:backdrop,
-    .titlebar .suggested-action.titlebutton.button:backdrop {
-      color: #d2deeb;
+    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar button.suggested-action.titlebutton:backdrop,
+    .titlebar button.suggested-action.titlebutton:backdrop {
+      color: #d3dfeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.flat:backdrop:checked,
-      .button.suggested-action:backdrop:active,
-      .button.suggested-action:backdrop:checked,
-      .button.suggested-action.flat:backdrop:active,
-      .suggested-action.sidebar-button.button:backdrop:active,
-      .header-bar .suggested-action.titlebutton.button:backdrop:active,
-      .titlebar .suggested-action.titlebutton.button:backdrop:active,
-      .button.suggested-action.flat:backdrop:checked,
-      .suggested-action.sidebar-button.button:backdrop:checked,
-      .header-bar .suggested-action.titlebutton.button:backdrop:checked,
-      .titlebar .suggested-action.titlebutton.button:backdrop:checked {
-        color: #d0d9e2;
+      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, .header-bar button.suggested-action.titlebutton:backdrop:active,
+      .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, .header-bar button.suggested-action.titlebutton:backdrop:checked,
+      .titlebar button.suggested-action.titlebutton:backdrop:checked {
+        color: #d1dae3;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #184472);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive,
-      .button.suggested-action:backdrop:insensitive,
-      .button.suggested-action.flat:backdrop:insensitive,
-      .suggested-action.sidebar-button.button:backdrop:insensitive,
-      .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
-      .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
+      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, .suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar button.suggested-action.titlebutton:backdrop:insensitive,
+      .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.suggested-action:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label,
-        .button.suggested-action:backdrop:insensitive > .label,
-        .button.suggested-action.flat:backdrop:insensitive > .label,
-        .suggested-action.sidebar-button.button:backdrop:insensitive > .label,
-        .header-bar .suggested-action.titlebutton.button:backdrop:insensitive > .label,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive > .label {
+        button.suggested-action:backdrop:insensitive > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, .suggested-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.suggested-action:backdrop:insensitive:active, button.suggested-action:backdrop:insensitive:checked, button.suggested-action.flat:backdrop:insensitive:active, button.suggested-action.flat:backdrop:insensitive:checked,
-        .button.suggested-action:backdrop:insensitive:active,
-        .button.suggested-action:backdrop:insensitive:checked,
-        .button.suggested-action.flat:backdrop:insensitive:active,
-        .suggested-action.sidebar-button.button:backdrop:insensitive:active,
-        .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active,
-        .button.suggested-action.flat:backdrop:insensitive:checked,
-        .suggested-action.sidebar-button.button:backdrop:insensitive:checked,
-        .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #6c88a5;
+        button.suggested-action:backdrop:insensitive:active, button.suggested-action:backdrop:insensitive:checked, button.suggested-action.flat:backdrop:insensitive:active, .suggested-action.sidebar-button.button:backdrop:insensitive:active, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, button.suggested-action.flat:backdrop:insensitive:checked, .suggested-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:checked,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked {
+          color: #6c88a7;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4876);
+          background-image: linear-gradient(to bottom, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          button.suggested-action:backdrop:insensitive:active > .label, button.suggested-action:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, button.suggested-action.flat:backdrop:insensitive:checked > .label,
-          .button.suggested-action:backdrop:insensitive:active > .label,
-          .button.suggested-action:backdrop:insensitive:checked > .label,
-          .button.suggested-action.flat:backdrop:insensitive:active > .label,
-          .suggested-action.sidebar-button.button:backdrop:insensitive:active > .label,
-          .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label,
-          .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label,
-          .button.suggested-action.flat:backdrop:insensitive:checked > .label,
-          .suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label,
-          .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label {
+          button.suggested-action:backdrop:insensitive:active > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action:backdrop:insensitive:checked > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, .suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action.flat:backdrop:insensitive:checked > .label, .suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.suggested-action.flat:backdrop, button.suggested-action.flat:insensitive, button.suggested-action.flat:backdrop:insensitive,
-    .button.suggested-action.flat:backdrop,
-    .suggested-action.sidebar-button.button:backdrop,
-    .header-bar .suggested-action.titlebutton.button:backdrop,
-    .titlebar .suggested-action.titlebutton.button:backdrop,
-    .button.suggested-action.flat:insensitive,
-    .suggested-action.sidebar-button.button:insensitive,
-    .header-bar .suggested-action.titlebutton.button:insensitive,
-    .titlebar .suggested-action.titlebutton.button:insensitive,
-    .button.suggested-action.flat:backdrop:insensitive,
-    .suggested-action.sidebar-button.button:backdrop:insensitive,
-    .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
-    .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
+    button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar button.suggested-action.titlebutton:backdrop,
+    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, .suggested-action.sidebar-button.button:insensitive, .header-bar button.suggested-action.titlebutton:insensitive,
+    .titlebar button.suggested-action.titlebutton:insensitive, button.suggested-action.flat:backdrop:insensitive, .suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar button.suggested-action.titlebutton:backdrop:insensitive,
+    .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -836,30 +688,26 @@ button,
       text-shadow: none;
       icon-shadow: none;
       color: rgba(33, 93, 156, 0.8); }
-    button.suggested-action:insensitive,
-    .button.suggested-action:insensitive {
-      color: #939695;
+    button.suggested-action:insensitive {
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      button.suggested-action:insensitive > .label,
-      .button.suggested-action:insensitive > .label {
+      button.suggested-action:insensitive > .label, .header-bar button.suggested-action.titlebutton:insensitive > .label,
+      .titlebar button.suggested-action.titlebutton:insensitive > .label {
         color: inherit; }
-      button.suggested-action:insensitive:active, button.suggested-action:insensitive:checked,
-      .button.suggested-action:insensitive:active,
-      .button.suggested-action:insensitive:checked {
-        color: #a4b5c8;
+      button.suggested-action:insensitive:active, button.suggested-action:insensitive:checked {
+        color: #a5b6c9;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #1b436f, #1d4876);
+        background-image: linear-gradient(to bottom, #1b4470, #1d4877);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-        button.suggested-action:insensitive:active > .label, button.suggested-action:insensitive:checked > .label,
-        .button.suggested-action:insensitive:active > .label,
-        .button.suggested-action:insensitive:checked > .label {
+        button.suggested-action:insensitive:active > .label, .header-bar button.suggested-action.titlebutton:insensitive:active > .label,
+        .titlebar button.suggested-action.titlebutton:insensitive:active > .label, button.suggested-action:insensitive:checked > .label, .header-bar button.suggested-action.titlebutton:insensitive:checked > .label,
+        .titlebar button.suggested-action.titlebutton:insensitive:checked > .label {
           color: inherit; }
-    .osd button.suggested-action, .osd
-    .button.suggested-action {
+    .osd button.suggested-action {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5));
@@ -868,8 +716,7 @@ button,
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.suggested-action:hover, .osd
-      .button.suggested-action:hover {
+      .osd button.suggested-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.7));
@@ -878,11 +725,7 @@ button,
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.suggested-action:active, .osd button.suggested-action:checked, .osd button.suggested-action:backdrop:active, .osd button.suggested-action:backdrop:checked, .osd
-      .button.suggested-action:active, .osd
-      .button.suggested-action:checked, .osd
-      .button.suggested-action:backdrop:active, .osd
-      .button.suggested-action:backdrop:checked {
+      .osd button.suggested-action:active, .osd button.suggested-action:checked, .osd button.suggested-action:backdrop:active, .osd button.suggested-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #215d9c);
@@ -891,18 +734,15 @@ button,
         text-shadow: none;
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.suggested-action:insensitive, .osd button.suggested-action:backdrop:insensitive, .osd
-      .button.suggested-action:insensitive, .osd
-      .button.suggested-action:backdrop:insensitive {
-        color: #878989;
+      .osd button.suggested-action:insensitive, .osd button.suggested-action:backdrop:insensitive {
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.suggested-action:backdrop, .osd
-      .button.suggested-action:backdrop {
+      .osd button.suggested-action:backdrop {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5));
@@ -910,10 +750,8 @@ button,
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  button.destructive-action,
-  .button.destructive-action,
-  .header-bar .destructive-action.button.titlebutton,
-  .titlebar .destructive-action.button.titlebutton {
+  button.destructive-action, .header-bar button.destructive-action.titlebutton,
+  .titlebar button.destructive-action.titlebutton {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5e0707;
@@ -921,11 +759,8 @@ button,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
-    button.destructive-action.flat,
-    .button.destructive-action.flat,
-    .destructive-action.sidebar-button.button,
-    .header-bar .destructive-action.titlebutton.button,
-    .titlebar .destructive-action.titlebutton.button {
+    button.destructive-action.flat, .destructive-action.sidebar-button.button, .header-bar button.destructive-action.titlebutton,
+    .titlebar button.destructive-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -933,8 +768,7 @@ button,
       text-shadow: none;
       icon-shadow: none;
       color: #d51010; }
-    button.destructive-action:hover,
-    .button.destructive-action:hover {
+    button.destructive-action:hover {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #5e0707;
@@ -942,9 +776,7 @@ button,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
-    button.destructive-action:active, button.destructive-action:checked,
-    .button.destructive-action:active,
-    .button.destructive-action:checked {
+    button.destructive-action:active, button.destructive-action:checked {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #5e0707;
@@ -952,92 +784,50 @@ button,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); }
-    button.destructive-action:backdrop, button.destructive-action.flat:backdrop,
-    .button.destructive-action:backdrop,
-    .button.destructive-action.flat:backdrop,
-    .destructive-action.sidebar-button.button:backdrop,
-    .header-bar .destructive-action.titlebutton.button:backdrop,
-    .titlebar .destructive-action.titlebutton.button:backdrop {
-      color: #f6cfcf;
+    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar button.destructive-action.titlebutton:backdrop,
+    .titlebar button.destructive-action.titlebutton:backdrop {
+      color: #f7cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, button.destructive-action.flat:backdrop:checked,
-      .button.destructive-action:backdrop:active,
-      .button.destructive-action:backdrop:checked,
-      .button.destructive-action.flat:backdrop:active,
-      .destructive-action.sidebar-button.button:backdrop:active,
-      .header-bar .destructive-action.titlebutton.button:backdrop:active,
-      .titlebar .destructive-action.titlebutton.button:backdrop:active,
-      .button.destructive-action.flat:backdrop:checked,
-      .destructive-action.sidebar-button.button:backdrop:checked,
-      .header-bar .destructive-action.titlebutton.button:backdrop:checked,
-      .titlebar .destructive-action.titlebutton.button:backdrop:checked {
+      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, .destructive-action.sidebar-button.button:backdrop:active, .header-bar button.destructive-action.titlebutton:backdrop:active,
+      .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, .destructive-action.sidebar-button.button:backdrop:checked, .header-bar button.destructive-action.titlebutton:backdrop:checked,
+      .titlebar button.destructive-action.titlebutton:backdrop:checked {
         color: #edcece;
         border-color: #5e0707;
         background-image: linear-gradient(to bottom, #a60c0c);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive,
-      .button.destructive-action:backdrop:insensitive,
-      .button.destructive-action.flat:backdrop:insensitive,
-      .destructive-action.sidebar-button.button:backdrop:insensitive,
-      .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
-      .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
+      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, .destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar button.destructive-action.titlebutton:backdrop:insensitive,
+      .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.destructive-action:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label,
-        .button.destructive-action:backdrop:insensitive > .label,
-        .button.destructive-action.flat:backdrop:insensitive > .label,
-        .destructive-action.sidebar-button.button:backdrop:insensitive > .label,
-        .header-bar .destructive-action.titlebutton.button:backdrop:insensitive > .label,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive > .label {
+        button.destructive-action:backdrop:insensitive > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, .destructive-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.destructive-action:backdrop:insensitive:active, button.destructive-action:backdrop:insensitive:checked, button.destructive-action.flat:backdrop:insensitive:active, button.destructive-action.flat:backdrop:insensitive:checked,
-        .button.destructive-action:backdrop:insensitive:active,
-        .button.destructive-action:backdrop:insensitive:checked,
-        .button.destructive-action.flat:backdrop:insensitive:active,
-        .destructive-action.sidebar-button.button:backdrop:insensitive:active,
-        .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active,
-        .button.destructive-action.flat:backdrop:insensitive:checked,
-        .destructive-action.sidebar-button.button:backdrop:insensitive:checked,
-        .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #c36464;
+        button.destructive-action:backdrop:insensitive:active, button.destructive-action:backdrop:insensitive:checked, button.destructive-action.flat:backdrop:insensitive:active, .destructive-action.sidebar-button.button:backdrop:insensitive:active, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, button.destructive-action.flat:backdrop:insensitive:checked, .destructive-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:checked,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked {
+          color: #c46565;
           border-color: #5e0707;
-          background-image: linear-gradient(to bottom, #a41111);
+          background-image: linear-gradient(to bottom, #a41212);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          button.destructive-action:backdrop:insensitive:active > .label, button.destructive-action:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, button.destructive-action.flat:backdrop:insensitive:checked > .label,
-          .button.destructive-action:backdrop:insensitive:active > .label,
-          .button.destructive-action:backdrop:insensitive:checked > .label,
-          .button.destructive-action.flat:backdrop:insensitive:active > .label,
-          .destructive-action.sidebar-button.button:backdrop:insensitive:active > .label,
-          .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label,
-          .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label,
-          .button.destructive-action.flat:backdrop:insensitive:checked > .label,
-          .destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label,
-          .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label {
+          button.destructive-action:backdrop:insensitive:active > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action:backdrop:insensitive:checked > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, .destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action.flat:backdrop:insensitive:checked > .label, .destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.destructive-action.flat:backdrop, button.destructive-action.flat:insensitive, button.destructive-action.flat:backdrop:insensitive,
-    .button.destructive-action.flat:backdrop,
-    .destructive-action.sidebar-button.button:backdrop,
-    .header-bar .destructive-action.titlebutton.button:backdrop,
-    .titlebar .destructive-action.titlebutton.button:backdrop,
-    .button.destructive-action.flat:insensitive,
-    .destructive-action.sidebar-button.button:insensitive,
-    .header-bar .destructive-action.titlebutton.button:insensitive,
-    .titlebar .destructive-action.titlebutton.button:insensitive,
-    .button.destructive-action.flat:backdrop:insensitive,
-    .destructive-action.sidebar-button.button:backdrop:insensitive,
-    .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
-    .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
+    button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar button.destructive-action.titlebutton:backdrop,
+    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, .destructive-action.sidebar-button.button:insensitive, .header-bar button.destructive-action.titlebutton:insensitive,
+    .titlebar button.destructive-action.titlebutton:insensitive, button.destructive-action.flat:backdrop:insensitive, .destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar button.destructive-action.titlebutton:backdrop:insensitive,
+    .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -1045,30 +835,26 @@ button,
       text-shadow: none;
       icon-shadow: none;
       color: rgba(213, 16, 16, 0.8); }
-    button.destructive-action:insensitive,
-    .button.destructive-action:insensitive {
-      color: #939695;
+    button.destructive-action:insensitive {
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-      button.destructive-action:insensitive > .label,
-      .button.destructive-action:insensitive > .label {
+      button.destructive-action:insensitive > .label, .header-bar button.destructive-action.titlebutton:insensitive > .label,
+      .titlebar button.destructive-action.titlebutton:insensitive > .label {
         color: inherit; }
-      button.destructive-action:insensitive:active, button.destructive-action:insensitive:checked,
-      .button.destructive-action:insensitive:active,
-      .button.destructive-action:insensitive:checked {
-        color: #da9f9f;
+      button.destructive-action:insensitive:active, button.destructive-action:insensitive:checked {
+        color: #dba0a0;
         border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #9d1010, #a41111);
+        background-image: linear-gradient(to bottom, #9d1111, #a41212);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-        button.destructive-action:insensitive:active > .label, button.destructive-action:insensitive:checked > .label,
-        .button.destructive-action:insensitive:active > .label,
-        .button.destructive-action:insensitive:checked > .label {
+        button.destructive-action:insensitive:active > .label, .header-bar button.destructive-action.titlebutton:insensitive:active > .label,
+        .titlebar button.destructive-action.titlebutton:insensitive:active > .label, button.destructive-action:insensitive:checked > .label, .header-bar button.destructive-action.titlebutton:insensitive:checked > .label,
+        .titlebar button.destructive-action.titlebutton:insensitive:checked > .label {
           color: inherit; }
-    .osd button.destructive-action, .osd
-    .button.destructive-action {
+    .osd button.destructive-action {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5));
@@ -1077,8 +863,7 @@ button,
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.destructive-action:hover, .osd
-      .button.destructive-action:hover {
+      .osd button.destructive-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.7));
@@ -1087,11 +872,7 @@ button,
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.destructive-action:active, .osd button.destructive-action:checked, .osd button.destructive-action:backdrop:active, .osd button.destructive-action:backdrop:checked, .osd
-      .button.destructive-action:active, .osd
-      .button.destructive-action:checked, .osd
-      .button.destructive-action:backdrop:active, .osd
-      .button.destructive-action:backdrop:checked {
+      .osd button.destructive-action:active, .osd button.destructive-action:checked, .osd button.destructive-action:backdrop:active, .osd button.destructive-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #d51010);
@@ -1100,18 +881,15 @@ button,
         text-shadow: none;
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.destructive-action:insensitive, .osd button.destructive-action:backdrop:insensitive, .osd
-      .button.destructive-action:insensitive, .osd
-      .button.destructive-action:backdrop:insensitive {
-        color: #878989;
+      .osd button.destructive-action:insensitive, .osd button.destructive-action:backdrop:insensitive {
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.destructive-action:backdrop, .osd
-      .button.destructive-action:backdrop {
+      .osd button.destructive-action:backdrop {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5));
@@ -1119,112 +897,76 @@ button,
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  button.image-button, .header-bar button.titlebutton.button,
-  .titlebar button.titlebutton.button,
-  .button.image-button,
-  GtkScaleButton.button,
-  GtkVolumeButton.button,
-  .header-bar .titlebutton.button,
-  .titlebar .titlebutton.button {
+  button.image-button, .header-bar button.titlebutton,
+  .titlebar button.titlebutton {
     padding: 8px; }
-  button.text-button,
-  .button.text-button,
-  GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button,
-  .header-bar .text-button.button.titlebutton,
-  .titlebar .text-button.button.titlebutton {
+  button.text-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar button.text-button.titlebutton,
+  .titlebar button.text-button.titlebutton {
     padding-left: 16px;
     padding-right: 16px; }
-  button.text-button.image-button, .header-bar button.text-button.titlebutton.button,
-  .titlebar button.text-button.titlebutton.button,
-  .button.text-button.image-button,
-  GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button,
-  .header-bar .text-button.titlebutton.button,
-  .titlebar .text-button.titlebutton.button {
+  button.text-button.image-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar button.text-button.titlebutton,
+  .titlebar button.text-button.titlebutton {
     padding: 5px 8px 6px; }
-    button.text-button.image-button label:first-child, .header-bar button.text-button.titlebutton.button label:first-child,
-    .titlebar button.text-button.titlebutton.button label:first-child,
-    .button.text-button.image-button label:first-child,
-    GtkScaleButton.button.text-button label:first-child,
-    GtkVolumeButton.button.text-button label:first-child,
-    .header-bar .text-button.titlebutton.button label:first-child,
-    .titlebar .text-button.titlebutton.button label:first-child {
+    button.text-button.image-button label:first-child, GtkScaleButton.button.text-button label:first-child,
+    GtkVolumeButton.button.text-button label:first-child, .header-bar button.text-button.titlebutton label:first-child,
+    .titlebar button.text-button.titlebutton label:first-child {
       padding-left: 8px; }
-    button.text-button.image-button label:last-child, .header-bar button.text-button.titlebutton.button label:last-child,
-    .titlebar button.text-button.titlebutton.button label:last-child,
-    .button.text-button.image-button label:last-child,
-    GtkScaleButton.button.text-button label:last-child,
-    GtkVolumeButton.button.text-button label:last-child,
-    .header-bar .text-button.titlebutton.button label:last-child,
-    .titlebar .text-button.titlebutton.button label:last-child {
+    button.text-button.image-button label:last-child, GtkScaleButton.button.text-button label:last-child,
+    GtkVolumeButton.button.text-button label:last-child, .header-bar button.text-button.titlebutton label:last-child,
+    .titlebar button.text-button.titlebutton label:last-child {
       padding-right: 8px; }
-  .stack-switcher > button, .stack-switcher >
-  .button, .header-bar .stack-switcher > .button.titlebutton,
-  .titlebar .stack-switcher > .button.titlebutton {
+  .stack-switcher > button, .header-bar .stack-switcher > button.titlebutton,
+  .titlebar .stack-switcher > button.titlebutton {
     outline-offset: -3px; }
-    .stack-switcher > button > label, .stack-switcher >
-    .button > label, .header-bar .stack-switcher > .button.titlebutton > label,
-    .titlebar .stack-switcher > .button.titlebutton > label {
+    .stack-switcher > button > label, .header-bar .stack-switcher > button.titlebutton > label,
+    .titlebar .stack-switcher > button.titlebutton > label {
       padding-left: 6px;
       padding-right: 6px; }
-    .stack-switcher > button > image, .stack-switcher >
-    .button > image, .header-bar .stack-switcher > .button.titlebutton > image,
-    .titlebar .stack-switcher > .button.titlebutton > image {
+    .stack-switcher > button > image, .header-bar .stack-switcher > button.titlebutton > image,
+    .titlebar .stack-switcher > button.titlebutton > image {
       padding-left: 6px;
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
-    .stack-switcher > button.text-button, .stack-switcher >
-    .button.text-button {
+    .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.button.text-button,
+    .stack-switcher > GtkVolumeButton.button.text-button, .header-bar .stack-switcher > button.text-button.titlebutton, .header-bar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
+    .header-bar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button,
+    .titlebar .stack-switcher > button.text-button.titlebutton,
+    .titlebar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
+    .titlebar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button {
       padding: 5px 10px 6px; }
-    .stack-switcher > button.image-button, .header-bar .stack-switcher > button.titlebutton.button,
-    .titlebar .stack-switcher > button.titlebutton.button, .stack-switcher >
-    .button.image-button, .stack-switcher >
-    GtkScaleButton.button,
-    .stack-switcher > GtkVolumeButton.button, .header-bar .stack-switcher > .titlebutton.button,
-    .titlebar .stack-switcher > .titlebutton.button {
+    .stack-switcher > button.image-button, .header-bar .stack-switcher > button.titlebutton,
+    .titlebar .stack-switcher > button.titlebutton {
       padding: 5px 2px; }
-    .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image, .stack-switcher >
-    .button.needs-attention:active > label, .stack-switcher >
-    .button.needs-attention:active > image, .stack-switcher >
-    .button.needs-attention:checked > label, .stack-switcher >
-    .button.needs-attention:checked > image {
+    .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image {
       animation: none;
       background-image: none; }
-  .inline-toolbar button, .inline-toolbar button:backdrop, .inline-toolbar
-  .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
-  .inline-toolbar .titlebar .button.titlebutton,
-  .titlebar .inline-toolbar .button.titlebutton, .inline-toolbar
-  .button:backdrop {
+  .inline-toolbar button, .inline-toolbar .header-bar button.titlebutton, .header-bar .inline-toolbar button.titlebutton,
+  .inline-toolbar .titlebar button.titlebutton,
+  .titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop {
     border-radius: 2px;
     border-width: 1px; }
-  .primary-toolbar button, .primary-toolbar
-  .button, .primary-toolbar .header-bar .button.titlebutton, .header-bar .primary-toolbar .button.titlebutton,
-  .primary-toolbar .titlebar .button.titlebutton,
-  .titlebar .primary-toolbar .button.titlebutton {
+  .primary-toolbar button, .primary-toolbar .header-bar button.titlebutton, .header-bar .primary-toolbar button.titlebutton,
+  .primary-toolbar .titlebar button.titlebutton,
+  .titlebar .primary-toolbar button.titlebutton {
     icon-shadow: none; }
 
-.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, .stack-switcher >
-.button.needs-attention > label, .stack-switcher >
-.button.needs-attention > image, .sidebar-item.needs-attention > label {
+.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, .sidebar-item.needs-attention > label {
   animation: needs_attention 150ms ease-in;
   background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#3583d5), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(0, 0, 0, 0.81176)), to(transparent));
   background-size: 6px 6px, 6px 6px;
   background-repeat: no-repeat;
   background-position: right 3px, right 2px; }
-  .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, .stack-switcher >
-  .button.needs-attention > label:backdrop, .stack-switcher >
-  .button.needs-attention > image:backdrop, .sidebar-item.needs-attention > label:backdrop {
+  .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, .sidebar-item.needs-attention > label:backdrop {
     background-size: 6px 6px, 0 0; }
-  .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), .stack-switcher >
-  .button.needs-attention > label:dir(rtl), .stack-switcher >
-  .button.needs-attention > image:dir(rtl), .sidebar-item.needs-attention > label:dir(rtl) {
+  .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), .sidebar-item.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 2px; }
 
-.inline-toolbar GtkToolButton > .button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton > .button.titlebutton {
+.inline-toolbar GtkToolButton > button, .inline-toolbar .header-bar GtkToolButton > button.titlebutton, .header-bar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton > button.titlebutton {
   color: #eeeeec;
   outline-color: rgba(238, 238, 236, 0.3);
   border-color: #1c1f1f;
@@ -1232,7 +974,8 @@ button,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  .inline-toolbar GtkToolButton > .button:hover {
+  .inline-toolbar GtkToolButton > button:hover, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:hover,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -1240,7 +983,9 @@ button,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-  .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked {
+  .inline-toolbar GtkToolButton > button:active, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:active, .inline-toolbar GtkToolButton > button:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:checked,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -1248,199 +993,192 @@ button,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); }
-  .inline-toolbar GtkToolButton > .button:insensitive {
-    color: #939695;
+  .inline-toolbar GtkToolButton > button:insensitive, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:insensitive,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive {
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-    .inline-toolbar GtkToolButton > .button:insensitive > .label {
+    .inline-toolbar GtkToolButton > button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: #939695;
+  .inline-toolbar GtkToolButton > button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:active, .inline-toolbar GtkToolButton > button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:insensitive:checked,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:checked {
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #2f3333, #323636);
+    background-image: linear-gradient(to bottom, #313434, #333636);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-    .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:insensitive:checked > .label {
+    .inline-toolbar GtkToolButton > button:insensitive:active > .label, .inline-toolbar GtkToolButton > button:insensitive:checked > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+  .inline-toolbar GtkToolButton > button:backdrop, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop {
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked {
-    color: #939695;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #2f3434);
+  .inline-toolbar GtkToolButton > button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:active, .inline-toolbar GtkToolButton > button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:checked,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:checked {
+    color: #949796;
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #303535);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
+  .inline-toolbar GtkToolButton > button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:insensitive,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-    .inline-toolbar GtkToolButton > .button:backdrop:insensitive > .label {
+    .inline-toolbar GtkToolButton > button:backdrop:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked {
+  .inline-toolbar GtkToolButton > button:backdrop:insensitive:active, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar GtkToolButton > button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:insensitive:checked,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:checked {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #262929);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #272929);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-    .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > .label {
+    .inline-toolbar GtkToolButton > button:backdrop:insensitive:active > .label, .inline-toolbar GtkToolButton > button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
-.inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat,
-.inline-toolbar GtkToolButton:backdrop > .button.flat,
-.inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat,
-.inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat,
+.inline-toolbar.toolbar GtkToolButton > button.flat, .inline-toolbar GtkToolButton > button.flat, .inline-toolbar.search-bar GtkToolButton > button.flat, .inline-toolbar.location-bar GtkToolButton > button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton > button.titlebutton, .header-bar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton:backdrop > button.flat,
+.inline-toolbar GtkToolButton:backdrop > button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop > button.flat,
+.inline-toolbar.location-bar GtkToolButton:backdrop > button.flat,
 .inline-toolbar.toolbar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop > .button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:backdrop > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton, .inline-toolbar button, .inline-toolbar button:backdrop, .inline-toolbar
-.button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
-.inline-toolbar .titlebar .button.titlebutton,
-.titlebar .inline-toolbar .button.titlebutton, .inline-toolbar
-.button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, .linked >
-.button, .header-bar .linked > .button.titlebutton,
-.titlebar .linked > .button.titlebutton, .linked >
-.button:hover, .linked >
-.button:active, .linked >
-.button:checked, .linked >
-.button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.inline-toolbar .header-bar GtkToolButton:backdrop > button.titlebutton,
+.header-bar .inline-toolbar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:backdrop > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop > button.titlebutton, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton, .inline-toolbar button, .inline-toolbar .header-bar button.titlebutton, .header-bar .inline-toolbar button.titlebutton,
+.inline-toolbar .titlebar button.titlebutton,
+.titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop, .linked > button, .header-bar .linked > button.titlebutton,
+.titlebar .linked > button.titlebutton, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
 .linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
 .linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .inline-toolbar
-.button:first-child, .linked > button:first-child, .linked >
-.button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
-.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat,
-.inline-toolbar GtkToolButton:backdrop:first-child > .button.flat,
-.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat,
-.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, .header-bar .linked > button.titlebutton:first-child,
+.titlebar .linked > button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > button.flat, .inline-toolbar GtkToolButton:first-child > button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:first-child > button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:first-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:first-child > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > button.flat,
+.inline-toolbar GtkToolButton:backdrop:first-child > button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > button.flat,
+.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > button.flat,
 .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.inline-toolbar .header-bar GtkToolButton:backdrop:first-child > button.titlebutton,
+.header-bar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:backdrop:first-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .inline-toolbar
-.button:last-child, .linked > button:last-child, .linked >
-.button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
-.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat,
-.inline-toolbar GtkToolButton:backdrop:last-child > .button.flat,
-.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat,
-.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, .header-bar .linked > button.titlebutton:last-child,
+.titlebar .linked > button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > button.flat, .inline-toolbar GtkToolButton:last-child > button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:last-child > button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:last-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:last-child > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > button.flat,
+.inline-toolbar GtkToolButton:backdrop:last-child > button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > button.flat,
+.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > button.flat,
 .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.inline-toolbar .header-bar GtkToolButton:backdrop:last-child > button.titlebutton,
+.header-bar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:backdrop:last-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .inline-toolbar
-.button:only-child, .linked > button:only-child, .linked >
-.button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
-.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat,
-.inline-toolbar GtkToolButton:backdrop:only-child > .button.flat,
-.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat,
-.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, .header-bar .linked > button.titlebutton:only-child,
+.titlebar .linked > button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > button.flat, .inline-toolbar GtkToolButton:only-child > button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:only-child > button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:only-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:only-child > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > button.flat,
+.inline-toolbar GtkToolButton:backdrop:only-child > button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > button.flat,
+.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > button.flat,
 .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.inline-toolbar .header-bar GtkToolButton:backdrop:only-child > button.titlebutton,
+.header-bar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:backdrop:only-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical >
-.button, .linked.vertical >
-.button:hover, .linked.vertical >
-.button:active, .linked.vertical >
-.button:checked, .linked.vertical >
-.button:backdrop, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > entry, .linked.vertical > button, .header-bar .linked.vertical > button.titlebutton,
+.titlebar .linked.vertical > button.titlebutton, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > button:first-child, .linked.vertical >
-.button:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > entry:first-child, .linked.vertical > button:first-child, .header-bar .linked.vertical > button.titlebutton:first-child,
+.titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > button:last-child, .linked.vertical >
-.button:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > entry:last-child, .linked.vertical > button:last-child, .header-bar .linked.vertical > button.titlebutton:last-child,
+.titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > button:only-child, .linked.vertical >
-.button:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > entry:only-child, .linked.vertical > button:only-child, .header-bar .linked.vertical > button.titlebutton:only-child,
+.titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
-.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.sidebar-button.button:backdrop, .menuitem.button.flat:backdrop:hover, .menuitem.sidebar-button.button:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
-.titlebar .menuitem.titlebutton.button:backdrop:hover, .button:link, .header-bar .button.titlebutton:link,
-.titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
-.titlebar .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .menu.button, .header-bar .menu.button.titlebutton,
-.titlebar .menu.button.titlebutton, notebook tab .button, notebook tab .header-bar .button.titlebutton, .header-bar notebook tab .button.titlebutton,
-notebook tab .titlebar .button.titlebutton,
-.titlebar notebook tab .button.titlebutton, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
-.app-notification .titlebar .titlebutton.button,
-.titlebar .app-notification .titlebutton.button,
-.app-notification.frame .button.flat,
-.app-notification.frame .sidebar-button.button, .app-notification .button.flat:backdrop, .app-notification .sidebar-button.button:backdrop, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
-.app-notification .titlebar .titlebutton.button:backdrop:insensitive,
-.titlebar .app-notification .titlebutton.button:backdrop:insensitive,
-.app-notification.frame .button.flat:backdrop,
+.menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, button:link, .header-bar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, .menu button, .menu .header-bar button.titlebutton, .header-bar .menu button.titlebutton,
+.menu .titlebar button.titlebutton,
+.titlebar .menu button.titlebutton, notebook tab button, notebook tab .header-bar button.titlebutton, .header-bar notebook tab button.titlebutton,
+notebook tab .titlebar button.titlebutton,
+.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification button.titlebutton,
+.app-notification .titlebar button.titlebutton,
+.titlebar .app-notification button.titlebutton,
+.app-notification.frame button.flat,
+.app-notification.frame .sidebar-button.button, .app-notification button.flat:backdrop, .app-notification .sidebar-button.button:backdrop, .app-notification button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, .app-notification button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, .app-notification .header-bar button.titlebutton:backdrop:insensitive, .header-bar .app-notification button.titlebutton:backdrop:insensitive,
+.app-notification .titlebar button.titlebutton:backdrop:insensitive,
+.titlebar .app-notification button.titlebutton:backdrop:insensitive,
+.app-notification.frame button.flat:backdrop,
 .app-notification.frame .sidebar-button.button:backdrop,
-.app-notification.frame .header-bar .button.titlebutton:backdrop,
-.header-bar .app-notification.frame .button.titlebutton:backdrop,
-.app-notification.frame .titlebar .button.titlebutton:backdrop,
-.titlebar .app-notification.frame .button.titlebutton:backdrop,
-.app-notification.frame .button.flat:insensitive,
+.app-notification.frame .header-bar button.titlebutton:backdrop,
+.header-bar .app-notification.frame button.titlebutton:backdrop,
+.app-notification.frame .titlebar button.titlebutton:backdrop,
+.titlebar .app-notification.frame button.titlebutton:backdrop,
+.app-notification.frame button.flat:insensitive,
 .app-notification.frame .sidebar-button.button:insensitive,
-.app-notification.frame .header-bar .button.titlebutton:insensitive,
-.header-bar .app-notification.frame .button.titlebutton:insensitive,
-.app-notification.frame .titlebar .button.titlebutton:insensitive,
-.titlebar .app-notification.frame .button.titlebutton:insensitive,
-.app-notification.frame .button.flat:backdrop:insensitive,
-.app-notification.frame .sidebar-button.button:backdrop:insensitive, calendar.button, .header-bar calendar.button.titlebutton,
-.titlebar calendar.button.titlebutton, calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive {
+.app-notification.frame .header-bar button.titlebutton:insensitive,
+.header-bar .app-notification.frame button.titlebutton:insensitive,
+.app-notification.frame .titlebar button.titlebutton:insensitive,
+.titlebar .app-notification.frame button.titlebutton:insensitive,
+.app-notification.frame button.flat:backdrop:insensitive,
+.app-notification.frame .sidebar-button.button:backdrop:insensitive, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, .scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -1449,15 +1187,12 @@ notebook tab .titlebar .button.titlebutton,
   icon-shadow: none; }
 
 /* menu buttons */
-.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
-.titlebar .menuitem.titlebutton.button {
+.menuitem.button.flat {
   outline-offset: -1px; }
-  .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar .menuitem.titlebutton.button:hover,
-  .titlebar .menuitem.titlebutton.button:hover {
-    background-color: #4b5050; }
+  .menuitem.button.flat:hover {
+    background-color: #4b5150; }
 
-GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
-.titlebar GtkColorButton.button.titlebutton {
+GtkColorButton.button {
   padding: 5px; }
   GtkColorButton.button GtkColorSwatch:first-child:last-child {
     border-radius: 0;
@@ -1468,49 +1203,53 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
 /*********
  * Links *
  *********/
-*:link, .button:link, .header-bar .button.titlebutton:link,
-.titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
-.titlebar .button.titlebutton:visited {
+*:link, button:link, .header-bar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+.titlebar button.titlebutton:visited {
   color: #4a90d9; }
-  *:link:visited, .button:visited, .header-bar .button.titlebutton:visited,
-  .titlebar .button.titlebutton:visited {
+  *:link:visited, button:visited, .header-bar button.titlebutton:visited,
+  .titlebar button.titlebutton:visited {
     color: #2a76c6; }
-    *:selected *:link:visited, *:selected .button:visited {
+    *:selected *:link:visited, *:selected button:visited:link, *:selected button:visited, *:selected .header-bar button.titlebutton:visited, .header-bar *:selected button.titlebutton:visited,
+    *:selected .titlebar button.titlebutton:visited,
+    .titlebar *:selected button.titlebutton:visited {
       color: #a6bed7; }
-  *:link:hover, .button:hover:link, .button:hover:visited {
+  *:link:hover, button:hover:link, button:hover:visited {
     color: #74aae2; }
-    *:selected *:link:hover, *:selected .button:hover:link, *:selected .button:hover:visited {
-      color: #e8eef5; }
-  *:link:active, .button:active:link, .button:active:visited {
+    *:selected *:link:hover, *:selected button:hover:link, *:selected button:hover:visited {
+      color: #e9eff5; }
+  *:link:active, button:active:link, button:active:visited {
     color: #4a90d9; }
-    *:selected *:link:active, *:selected .button:active:link, *:selected .button:active:visited {
-      color: #d2deeb; }
-  *:link:backdrop, .button:backdrop:link, .button:backdrop:visited, *:link:backdrop:hover, .button:backdrop:hover:link, .button:backdrop:hover:visited, *:link:backdrop:hover:selected, .button:backdrop:hover:selected:link, .button:backdrop:hover:selected:visited, .titlebar.selection-mode .subtitle:backdrop:hover:link,
+    *:selected *:link:active, *:selected button:active:link, *:selected button:active:visited {
+      color: #d3dfeb; }
+  *:link:backdrop, button:backdrop:link, button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link, button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link, button:backdrop:hover:selected:visited, .titlebar.selection-mode .subtitle:backdrop:hover:link,
   .header-bar.selection-mode .subtitle:backdrop:hover:link {
     color: #215d9c; }
-  *:link:selected, .button:selected:link, .button:selected:visited, .titlebar.selection-mode .subtitle:link,
-  .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited {
-    color: #d2deeb; }
+  *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .subtitle:link,
+  .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected button:visited {
+    color: #d3dfeb; }
 
-.button:link, .header-bar .button.titlebutton:link,
-.titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
-.titlebar .button.titlebutton:visited {
+button:link, .header-bar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+.titlebar button.titlebutton:visited {
   text-shadow: none; }
-  .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked {
+  button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked {
     text-shadow: none; }
-  .button:link > label, .header-bar .button.titlebutton:link > label,
-  .titlebar .button.titlebutton:link > label, .button:visited > label, .header-bar .button.titlebutton:visited > label,
-  .titlebar .button.titlebutton:visited > label {
+  button:link > label, .header-bar button.titlebutton:link > label,
+  .titlebar button.titlebutton:link > label, button:visited > label, .header-bar button.titlebutton:visited > label,
+  .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
 /*****************
  * GtkSpinButton *
  *****************/
-spinbutton:not(.vertical) button {
+spinbutton:not(.vertical) button, spinbutton:not(.vertical) .header-bar button.titlebutton, .header-bar spinbutton:not(.vertical) button.titlebutton,
+spinbutton:not(.vertical) .titlebar button.titlebutton,
+.titlebar spinbutton:not(.vertical) button.titlebutton {
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(28, 31, 31, 0.3);
-  color: #dadad8;
+  color: #dadad9;
   border-radius: 0;
   box-shadow: none; }
   spinbutton:not(.vertical) button:dir(rtl) {
@@ -1519,13 +1258,13 @@ spinbutton:not(.vertical) button {
     color: #eeeeec;
     background-color: rgba(238, 238, 236, 0.05); }
   spinbutton:not(.vertical) button:insensitive {
-    color: rgba(147, 150, 149, 0.3); }
+    color: rgba(148, 151, 150, 0.3); }
   spinbutton:not(.vertical) button:active {
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
     background-color: rgba(0, 0, 0, 0.1); }
   spinbutton:not(.vertical) button:backdrop {
-    color: #888b8a;
-    border-color: rgba(30, 34, 34, 0.3);
+    color: #8a8c8b;
+    border-color: rgba(31, 34, 34, 0.3);
     background-color: transparent; }
   spinbutton:not(.vertical) button:backdrop:insensitive {
     background-image: none;
@@ -1578,7 +1317,7 @@ spinbutton:not(.vertical) button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.5);
     icon-shadow: none;
     box-shadow: none; }
@@ -1586,7 +1325,9 @@ spinbutton:not(.vertical) button {
     border-radius: 0 3px 3px 0; }
   .osd spinbutton:not(.vertical) button:dir(rtl):first-child {
     border-radius: 3px 0 0 3px; }
-spinbutton.vertical button {
+spinbutton.vertical button, spinbutton.vertical .header-bar button.titlebutton, .header-bar spinbutton.vertical button.titlebutton,
+spinbutton.vertical .titlebar button.titlebutton,
+.titlebar spinbutton.vertical button.titlebutton {
   padding-top: 8px;
   padding-bottom: 8px; }
   spinbutton.vertical button:first-child {
@@ -1614,29 +1355,31 @@ spinbutton.vertical button {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
     spinbutton.vertical button:first-child:insensitive {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      spinbutton.vertical button:first-child:insensitive > .label {
+      spinbutton.vertical button:first-child:insensitive > .label, spinbutton.vertical .header-bar button.titlebutton:first-child:insensitive > .label,
+      spinbutton.vertical .titlebar button.titlebutton:first-child:insensitive > .label {
         color: inherit; }
     spinbutton.vertical button:first-child:backdrop {
-      color: #939695;
-      border-color: #1e2222;
+      color: #949796;
+      border-color: #1f2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       spinbutton.vertical button:first-child:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:backdrop:insensitive > .label {
+        spinbutton.vertical button:first-child:backdrop:insensitive > .label, spinbutton.vertical .header-bar button.titlebutton:first-child:backdrop:insensitive > .label,
+        spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:insensitive > .label {
           color: inherit; }
 spinbutton.vertical button:first-child, spinbutton.vertical button:first-child:active, spinbutton.vertical button:first-child:hover, spinbutton.vertical button:first-child:insensitive, spinbutton.vertical button:first-child:backdrop {
   border-radius: 3px 3px 0 0;
@@ -1672,9 +1415,9 @@ spinbutton.vertical button:last-child {
     icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:insensitive {
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1706,11 +1449,11 @@ GtkComboBox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
-    color: #939695;
+    color: #949796;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: #939695;
+    color: #949796;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
@@ -1725,11 +1468,11 @@ GtkComboBox {
   GtkComboBox.combobox-entry entry:dir(rtl) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0; }
-  GtkComboBox.combobox-entry .button:dir(ltr) {
+  GtkComboBox.combobox-entry button:dir(ltr) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     border-left-style: none; }
-  GtkComboBox.combobox-entry .button:dir(rtl) {
+  GtkComboBox.combobox-entry button:dir(rtl) {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-style: none; }
@@ -1760,10 +1503,10 @@ GtkComboBox {
   border-style: solid;
   border-color: #1c1f1f;
   background-color: #303535;
-  box-shadow: inset 0 2px 3px -1px #242727, 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 2px 3px -1px #242828, 0 1px rgba(238, 238, 236, 0.1); }
   .inline-toolbar:backdrop, .search-bar:backdrop, .location-bar:backdrop {
-    border-color: #1e2222;
-    background-color: #2f3434;
+    border-color: #1f2222;
+    background-color: #303535;
     box-shadow: none; }
 
 /***************
@@ -1778,10 +1521,10 @@ GtkComboBox {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #434a4a, #393f3f);
-  box-shadow: inset 0 -1px #2d3232, inset 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 -1px #2e3232, inset 0 1px rgba(238, 238, 236, 0.1); }
   .titlebar:backdrop,
   .header-bar:backdrop {
-    border-color: #1e2222;
+    border-color: #1f2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1); }
@@ -1805,20 +1548,20 @@ GtkComboBox {
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
     .header-bar .header-bar-separator:backdrop,
     .header-bar > GtkBox > separator.vertical:backdrop {
-      border-image: linear-gradient(to bottom, rgba(30, 34, 34, 0.5)) 0 1/1px 1px; }
+      border-image: linear-gradient(to bottom, rgba(31, 34, 34, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
   .header-bar.selection-mode {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #0f2b48;
     background-image: linear-gradient(to bottom, #256ab1, #215d9c);
-    box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(43, 100, 160, 0.55); }
+    box-shadow: inset 0 -1px #1b4c7f, inset 0 1px rgba(43, 100, 160, 0.55); }
     .titlebar.selection-mode:backdrop,
     .header-bar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #215d9c);
-      box-shadow: inset 0 1px rgba(48, 103, 161, 0.46); }
-    .titlebar.selection-mode .button,
-    .header-bar.selection-mode .button {
+      box-shadow: inset 0 1px rgba(48, 104, 162, 0.46); }
+    .titlebar.selection-mode button,
+    .header-bar.selection-mode button {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0b1e33;
@@ -1826,19 +1569,19 @@ GtkComboBox {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55); }
-      .titlebar.selection-mode .button.flat, .titlebar.selection-mode .sidebar-button.button,
-      .titlebar.selection-mode .titlebutton.button,
-      .header-bar.selection-mode .button.flat,
+      .titlebar.selection-mode button.flat, .titlebar.selection-mode .sidebar-button.button,
+      .titlebar.selection-mode button.titlebutton,
+      .header-bar.selection-mode button.flat,
       .header-bar.selection-mode .sidebar-button.button,
-      .header-bar.selection-mode .titlebutton.button {
+      .header-bar.selection-mode button.titlebutton {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .titlebar.selection-mode .button:hover,
-      .header-bar.selection-mode .button:hover {
+      .titlebar.selection-mode button:hover,
+      .header-bar.selection-mode button:hover {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #0b1e33;
@@ -1846,9 +1589,9 @@ GtkComboBox {
         text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55); }
-      .titlebar.selection-mode .button:active, .titlebar.selection-mode .button:checked,
-      .header-bar.selection-mode .button:active,
-      .header-bar.selection-mode .button:checked {
+      .titlebar.selection-mode button:active, .titlebar.selection-mode button:checked,
+      .header-bar.selection-mode button:active,
+      .header-bar.selection-mode button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #0b1e33;
@@ -1856,13 +1599,13 @@ GtkComboBox {
         text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(43, 100, 160, 0.55); }
-      .titlebar.selection-mode .button:backdrop, .titlebar.selection-mode .button.flat:backdrop, .titlebar.selection-mode .sidebar-button.button:backdrop,
-      .titlebar.selection-mode .titlebutton.button:backdrop,
-      .header-bar.selection-mode .button:backdrop,
-      .header-bar.selection-mode .button.flat:backdrop,
+      .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode .sidebar-button.button:backdrop,
+      .titlebar.selection-mode button.titlebutton:backdrop,
+      .header-bar.selection-mode button:backdrop,
+      .header-bar.selection-mode button.flat:backdrop,
       .header-bar.selection-mode .sidebar-button.button:backdrop,
-      .header-bar.selection-mode .titlebutton.button:backdrop {
-        color: #d2deeb;
+      .header-bar.selection-mode button.titlebutton:backdrop {
+        color: #d3dfeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
         text-shadow: none;
@@ -1870,113 +1613,122 @@ GtkComboBox {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
         -gtk-image-effect: none;
         border-color: #0f2b48; }
-        .titlebar.selection-mode .button:backdrop:active, .titlebar.selection-mode .button:backdrop:checked, .titlebar.selection-mode .button.flat:backdrop:active, .titlebar.selection-mode .sidebar-button.button:backdrop:active,
-        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
-        .titlebar.selection-mode .titlebutton.button:backdrop:checked,
-        .header-bar.selection-mode .button:backdrop:active,
-        .header-bar.selection-mode .button:backdrop:checked,
-        .header-bar.selection-mode .button.flat:backdrop:active,
+        .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, .titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode .sidebar-button.button:backdrop:active,
+        .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
+        .titlebar.selection-mode button.titlebutton:backdrop:checked,
+        .header-bar.selection-mode button:backdrop:active,
+        .header-bar.selection-mode button:backdrop:checked,
+        .header-bar.selection-mode button.flat:backdrop:active,
         .header-bar.selection-mode .sidebar-button.button:backdrop:active,
-        .header-bar.selection-mode .titlebutton.button:backdrop:active,
-        .header-bar.selection-mode .button.flat:backdrop:checked,
+        .header-bar.selection-mode button.titlebutton:backdrop:active,
+        .header-bar.selection-mode button.flat:backdrop:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:checked,
-        .header-bar.selection-mode .titlebutton.button:backdrop:checked {
-          color: #d0d9e2;
+        .header-bar.selection-mode button.titlebutton:backdrop:checked {
+          color: #d1dae3;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-        .titlebar.selection-mode .button:backdrop:insensitive, .titlebar.selection-mode .button.flat:backdrop:insensitive, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive,
-        .titlebar.selection-mode .titlebutton.button:backdrop:insensitive,
-        .header-bar.selection-mode .button:backdrop:insensitive,
-        .header-bar.selection-mode .button.flat:backdrop:insensitive,
+        .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode button.flat:backdrop:insensitive, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive,
+        .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
+        .header-bar.selection-mode button:backdrop:insensitive,
+        .header-bar.selection-mode button.flat:backdrop:insensitive,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive,
-        .header-bar.selection-mode .titlebutton.button:backdrop:insensitive {
-          color: #6f90b2;
+        .header-bar.selection-mode button.titlebutton:backdrop:insensitive {
+          color: #6f91b4;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #22558a);
+          background-image: linear-gradient(to bottom, #22558b);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
-          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .button.flat:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode button:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode button.flat:backdrop:insensitive > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label {
+          .header-bar.selection-mode button.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
-        .titlebar.selection-mode .button:backdrop:insensitive:active, .titlebar.selection-mode .button:backdrop:insensitive:checked, .titlebar.selection-mode .button.flat:backdrop:insensitive:active, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
-        .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
-        .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked,
-        .header-bar.selection-mode .button:backdrop:insensitive:active,
-        .header-bar.selection-mode .button:backdrop:insensitive:checked,
-        .header-bar.selection-mode .button.flat:backdrop:insensitive:active,
+        .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
+        .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
+        .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked,
+        .header-bar.selection-mode button:backdrop:insensitive:active,
+        .header-bar.selection-mode button:backdrop:insensitive:checked,
+        .header-bar.selection-mode button.flat:backdrop:insensitive:active,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
-        .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active,
-        .header-bar.selection-mode .button.flat:backdrop:insensitive:checked,
+        .header-bar.selection-mode button.titlebutton:backdrop:insensitive:active,
+        .header-bar.selection-mode button.flat:backdrop:insensitive:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
-        .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked {
-          color: #6c88a5;
+        .header-bar.selection-mode button.titlebutton:backdrop:insensitive:checked {
+          color: #6c88a7;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4876);
+          background-image: linear-gradient(to bottom, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
-          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .button.flat:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode button:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode button:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode button.flat:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .button.flat:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode button.flat:backdrop:insensitive:checked > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label {
+          .header-bar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode .button.flat:backdrop, .titlebar.selection-mode .sidebar-button.button:backdrop,
-      .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive, .titlebar.selection-mode .sidebar-button.button:insensitive,
-      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
-      .titlebar.selection-mode .titlebutton.button:insensitive:backdrop,
-      .header-bar.selection-mode .button.flat:backdrop,
+      .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode .sidebar-button.button:backdrop,
+      .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive, .titlebar.selection-mode .sidebar-button.button:insensitive,
+      .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
+      .titlebar.selection-mode button.titlebutton:insensitive:backdrop,
+      .header-bar.selection-mode button.flat:backdrop,
       .header-bar.selection-mode .sidebar-button.button:backdrop,
-      .header-bar.selection-mode .titlebutton.button:backdrop,
-      .header-bar.selection-mode .button.flat:insensitive,
+      .header-bar.selection-mode button.titlebutton:backdrop,
+      .header-bar.selection-mode button.flat:insensitive,
       .header-bar.selection-mode .sidebar-button.button:insensitive,
-      .header-bar.selection-mode .titlebutton.button:insensitive,
-      .header-bar.selection-mode .button.flat:insensitive:backdrop,
+      .header-bar.selection-mode button.titlebutton:insensitive,
+      .header-bar.selection-mode button.flat:insensitive:backdrop,
       .header-bar.selection-mode .sidebar-button.button:insensitive:backdrop,
-      .header-bar.selection-mode .titlebutton.button:insensitive:backdrop {
+      .header-bar.selection-mode button.titlebutton:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .titlebar.selection-mode .button:insensitive,
-      .header-bar.selection-mode .button:insensitive {
-        color: #90aac4;
+      .titlebar.selection-mode button:insensitive,
+      .header-bar.selection-mode button:insensitive {
+        color: #91aac5;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558a);
+        background-image: linear-gradient(to bottom, #22558b);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); }
-        .titlebar.selection-mode .button:insensitive > .label,
-        .header-bar.selection-mode .button:insensitive > .label {
+        .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode .header-bar button.titlebutton:insensitive > .label,
+        .header-bar.selection-mode button:insensitive > .label,
+        .header-bar.selection-mode .titlebar button.titlebutton:insensitive > .label {
           color: inherit; }
-        .titlebar.selection-mode .button:insensitive:active, .titlebar.selection-mode .button:insensitive:checked,
-        .header-bar.selection-mode .button:insensitive:active,
-        .header-bar.selection-mode .button:insensitive:checked {
-          color: #a4b5c8;
+        .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode button:insensitive:checked,
+        .header-bar.selection-mode button:insensitive:active,
+        .header-bar.selection-mode button:insensitive:checked {
+          color: #a5b6c9;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1b436f, #1d4876);
+          background-image: linear-gradient(to bottom, #1b4470, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55); }
-          .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > .label,
-          .header-bar.selection-mode .button:insensitive:active > .label,
-          .header-bar.selection-mode .button:insensitive:checked > .label {
+          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode .header-bar button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, .titlebar.selection-mode .header-bar button.titlebutton:insensitive:checked > .label,
+          .header-bar.selection-mode button:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
+          .header-bar.selection-mode button:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode .button.suggested-action,
-      .header-bar.selection-mode .button.suggested-action {
+      .titlebar.selection-mode button.suggested-action,
+      .header-bar.selection-mode button.suggested-action {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #1c1f1f;
@@ -1985,8 +1737,8 @@ GtkComboBox {
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55);
         border-color: #0f2b48; }
-        .titlebar.selection-mode .button.suggested-action:hover,
-        .header-bar.selection-mode .button.suggested-action:hover {
+        .titlebar.selection-mode button.suggested-action:hover,
+        .header-bar.selection-mode button.suggested-action:hover {
           color: #eeeeec;
           outline-color: rgba(238, 238, 236, 0.3);
           border-color: #1c1f1f;
@@ -1995,8 +1747,8 @@ GtkComboBox {
           icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(43, 100, 160, 0.55);
           border-color: #0f2b48; }
-        .titlebar.selection-mode .button.suggested-action:active,
-        .header-bar.selection-mode .button.suggested-action:active {
+        .titlebar.selection-mode button.suggested-action:active,
+        .header-bar.selection-mode button.suggested-action:active {
           color: #eeeeec;
           outline-color: rgba(238, 238, 236, 0.3);
           border-color: #1c1f1f;
@@ -2005,38 +1757,40 @@ GtkComboBox {
           icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
           box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(43, 100, 160, 0.55);
           border-color: #0f2b48; }
-        .titlebar.selection-mode .button.suggested-action:insensitive,
-        .header-bar.selection-mode .button.suggested-action:insensitive {
-          color: #939695;
+        .titlebar.selection-mode button.suggested-action:insensitive,
+        .header-bar.selection-mode button.suggested-action:insensitive {
+          color: #949796;
           border-color: #1c1f1f;
-          background-image: linear-gradient(to bottom, #323636);
+          background-image: linear-gradient(to bottom, #333636);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0.55);
           border-color: #0f2b48; }
-          .titlebar.selection-mode .button.suggested-action:insensitive > .label,
-          .header-bar.selection-mode .button.suggested-action:insensitive > .label {
+          .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode .header-bar button.suggested-action.titlebutton:insensitive > .label,
+          .header-bar.selection-mode button.suggested-action:insensitive > .label,
+          .header-bar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
             color: inherit; }
-        .titlebar.selection-mode .button.suggested-action:backdrop,
-        .header-bar.selection-mode .button.suggested-action:backdrop {
-          color: #939695;
-          border-color: #1e2222;
+        .titlebar.selection-mode button.suggested-action:backdrop,
+        .header-bar.selection-mode button.suggested-action:backdrop {
+          color: #949796;
+          border-color: #1f2222;
           background-image: linear-gradient(to bottom, #393f3f);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-        .titlebar.selection-mode .button.suggested-action:backdrop:insensitive,
-        .header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
+        .titlebar.selection-mode button.suggested-action:backdrop:insensitive,
+        .header-bar.selection-mode button.suggested-action:backdrop:insensitive {
           color: #5d6767;
-          border-color: #1e2222;
-          background-image: linear-gradient(to bottom, #323636);
+          border-color: #1f2222;
+          background-image: linear-gradient(to bottom, #333636);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(43, 100, 160, 0);
           border-color: #0f2b48; }
-          .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label,
-          .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label {
+          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
     .header-bar.selection-mode .selection-menu,
@@ -2062,34 +1816,34 @@ GtkComboBox {
   .titlebar.default-decoration,
   .header-bar.default-decoration {
     padding: 4px; }
-    .titlebar.default-decoration .button,
-    .header-bar.default-decoration .button {
+    .titlebar.default-decoration button,
+    .header-bar.default-decoration button {
       padding: 5px; }
 
 /************
  * Pathbars *
  ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton {
+.path-bar button, .path-bar .header-bar button.titlebutton, .header-bar .path-bar button.titlebutton,
+.path-bar .titlebar button.titlebutton,
+.titlebar .path-bar button.titlebutton {
   padding: 5px 6px 6px; }
-  .path-bar .button:first-child {
+  .path-bar button:first-child {
     padding-left: 8px; }
-  .path-bar .button:last-child {
+  .path-bar button:last-child {
     padding-right: 8px; }
-  .path-bar .button:only-child {
+  .path-bar button:only-child {
     padding-left: 12px;
     padding-right: 12px; }
-  .path-bar .button label:last-child {
+  .path-bar button label:last-child {
     padding-left: 2px; }
-  .path-bar .button label:first-child {
+  .path-bar button label:first-child {
     padding-right: 2px; }
-  .path-bar .button label:only-child {
+  .path-bar button label:only-child {
     padding-right: 0;
     padding-left: 0; }
-  .path-bar .button image, .path-bar .header-bar .button.titlebutton image, .header-bar .path-bar .button.titlebutton image,
-  .path-bar .titlebar .button.titlebutton image,
-  .titlebar .path-bar .button.titlebutton image {
+  .path-bar button image, .path-bar .header-bar button.titlebutton image, .header-bar .path-bar button.titlebutton image,
+  .path-bar .titlebar button.titlebutton image,
+  .titlebar .path-bar button.titlebutton image {
     padding-top: 1px; }
 
 /**************
@@ -2101,33 +1855,33 @@ GtkTreeView.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #8b8b8a;
+  border-left-color: #8c8c8b;
   border-top-color: #393f3f; }
   GtkTreeView.view:selected {
     border-radius: 0; }
   GtkTreeView.view:selected, GtkTreeView.view:backdrop:selected {
-    border-left-color: #90aecd;
+    border-left-color: #90aece;
     border-top-color: rgba(238, 238, 236, 0.1); }
   GtkTreeView.view:insensitive {
-    color: #939695; }
+    color: #949796; }
     GtkTreeView.view:insensitive:selected {
-      color: #799dc3; }
+      color: #7a9ec4; }
       GtkTreeView.view:insensitive:selected:backdrop {
-        color: #638db9; }
+        color: #648eba; }
     GtkTreeView.view:insensitive:backdrop {
       color: #5d6767; }
   GtkTreeView.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   GtkTreeView.view:backdrop {
-    border-left-color: #666a6a;
+    border-left-color: #676b6b;
     border-top: #393f3f; }
   GtkTreeView.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #87a5c4; }
+    border-color: #88a6c4; }
   GtkTreeView.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b2b2b1; }
+    color: #b3b3b2; }
     GtkTreeView.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     GtkTreeView.view.expander:hover {
@@ -2141,7 +1895,7 @@ GtkTreeView.view {
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
-      color: #747675; }
+      color: #757776; }
   GtkTreeView.view.progressbar {
     border: 1px solid #0f2b48;
     border-radius: 4px;
@@ -2163,62 +1917,62 @@ GtkTreeView.view {
     GtkTreeView.view.trough:selected {
       background-color: #184472; }
 
-column-header .button, column-header .header-bar .button.titlebutton, .header-bar column-header .button.titlebutton,
-column-header .titlebar .button.titlebutton,
-.titlebar column-header .button.titlebutton {
-  color: #8b8b8a;
+column-header button, column-header .header-bar button.titlebutton, .header-bar column-header button.titlebutton,
+column-header .titlebar button.titlebutton,
+.titlebar column-header button.titlebutton {
+  color: #8c8c8b;
   background-color: #292929;
   font-weight: bold;
   text-shadow: none;
   box-shadow: none; }
-  column-header .button:hover, column-header .header-bar .button.titlebutton:hover, .header-bar column-header .button.titlebutton:hover,
-  column-header .titlebar .button.titlebutton:hover,
-  .titlebar column-header .button.titlebutton:hover {
-    color: #bcbcbb;
+  column-header button:hover, column-header .header-bar button.titlebutton:hover, .header-bar column-header button.titlebutton:hover,
+  column-header .titlebar button.titlebutton:hover,
+  .titlebar column-header button.titlebutton:hover {
+    color: #bdbdbc;
     box-shadow: none;
     transition: none; }
-  column-header .button:active, column-header .header-bar .button.titlebutton:active, .header-bar column-header .button.titlebutton:active,
-  column-header .titlebar .button.titlebutton:active,
-  .titlebar column-header .button.titlebutton:active {
+  column-header button:active, column-header .header-bar button.titlebutton:active, .header-bar column-header button.titlebutton:active,
+  column-header .titlebar button.titlebutton:active,
+  .titlebar column-header button.titlebutton:active {
     color: #eeeeec;
     transition: none; }
-column-header .button:last-child, column-header .header-bar .button.titlebutton:last-child, .header-bar column-header .button.titlebutton:last-child,
-column-header .titlebar .button.titlebutton:last-child,
-.titlebar column-header .button.titlebutton:last-child, column-header .button:last-child:backdrop, column-header:last-child.button, .header-bar column-header.button.titlebutton:last-child,
-.titlebar column-header.button.titlebutton:last-child, column-header:last-child.button:backdrop {
+column-header button:last-child, column-header .header-bar button.titlebutton:last-child, .header-bar column-header button.titlebutton:last-child,
+column-header .titlebar button.titlebutton:last-child,
+.titlebar column-header button.titlebutton:last-child, column-header button:last-child:backdrop, column-header:last-child button, column-header:last-child .header-bar button.titlebutton, .header-bar column-header:last-child button.titlebutton,
+column-header:last-child .titlebar button.titlebutton,
+.titlebar column-header:last-child button.titlebutton, column-header:last-child button:backdrop {
   border-right-style: none; }
 
-column-header.button.dnd, column-header .button.dnd, column-header .header-bar .dnd.button.titlebutton, .header-bar column-header .dnd.button.titlebutton,
-column-header .titlebar .dnd.button.titlebutton,
-.titlebar column-header .dnd.button.titlebutton, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover, .header-bar column-header.dnd.button.titlebutton,
-.titlebar column-header.dnd.button.titlebutton {
+column-header.button.dnd, column-header button.dnd, column-header .header-bar button.dnd.titlebutton, .header-bar column-header button.dnd.titlebutton,
+column-header .titlebar button.dnd.titlebutton,
+.titlebar column-header button.dnd.titlebutton, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover {
   transition: none;
   color: #215d9c;
   box-shadow: inset 1px 1px 0 1px #215d9c, inset -1px 0 0 1px #215d9c, inset 1px 1px #292929, inset -1px 0 #292929; }
 
-column-header .button, column-header .header-bar .button.titlebutton, .header-bar column-header .button.titlebutton,
-column-header .titlebar .button.titlebutton,
-.titlebar column-header .button.titlebutton, column-header .button:hover, column-header .button:active {
+column-header button, column-header .header-bar button.titlebutton, .header-bar column-header button.titlebutton,
+column-header .titlebar button.titlebutton,
+.titlebar column-header button.titlebutton, column-header button:hover, column-header button:active {
   padding: 3px 6px;
   border-style: none solid solid none;
   border-radius: 0;
   background-image: none;
   border-color: #393f3f;
   text-shadow: none; }
-  column-header .button:insensitive, column-header .header-bar .button.titlebutton:insensitive, .header-bar column-header .button.titlebutton:insensitive,
-  column-header .titlebar .button.titlebutton:insensitive,
-  .titlebar column-header .button.titlebutton:insensitive {
+  column-header button:insensitive, column-header .header-bar button.titlebutton:insensitive, .header-bar column-header button.titlebutton:insensitive,
+  column-header .titlebar button.titlebutton:insensitive,
+  .titlebar column-header button.titlebutton:insensitive {
     border-color: #393f3f;
     background-image: none; }
-  column-header .button:backdrop, column-header .header-bar .button.titlebutton:backdrop, .header-bar column-header .button.titlebutton:backdrop,
-  column-header .titlebar .button.titlebutton:backdrop,
-  .titlebar column-header .button.titlebutton:backdrop {
+  column-header button:backdrop, column-header .header-bar button.titlebutton:backdrop, .header-bar column-header button.titlebutton:backdrop,
+  column-header .titlebar button.titlebutton:backdrop,
+  .titlebar column-header button.titlebutton:backdrop {
     border-color: #393f3f;
     border-style: none solid solid none;
-    color: #666a6a;
+    color: #676b6b;
     background-image: none;
     background-color: #2c2c2c; }
-    column-header .button:backdrop:insensitive {
+    column-header button:backdrop:insensitive {
       border-color: #393f3f;
       background-image: none; }
 
@@ -2237,7 +1991,7 @@ column-header .titlebar .button.titlebutton,
       box-shadow: inset 0 -3px #215d9c;
       color: #4a90d9; }
     .menubar > .menuitem:insensitive {
-      color: #939695;
+      color: #949796;
       box-shadow: none; }
 
 .menu {
@@ -2254,27 +2008,28 @@ column-header .titlebar .button.titlebutton,
       color: #ffffff;
       background-color: #215d9c; }
     .menu .menuitem:insensitive {
-      color: #939695; }
+      color: #949796; }
       .menu .menuitem:insensitive:backdrop {
         color: #5d6767; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
-      color: #939695;
+      color: #949796;
       background-color: #2c2c2c; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
-  .menu.button, .header-bar .menu.button.titlebutton,
-  .titlebar .menu.button.titlebutton {
+  .menu button, .menu .header-bar button.titlebutton, .header-bar .menu button.titlebutton,
+  .menu .titlebar button.titlebutton,
+  .titlebar .menu button.titlebutton {
     border-style: none;
     border-radius: 0; }
-    .menu.button.top {
-      border-bottom: 1px solid #3c3c3c; }
-    .menu.button.bottom {
-      border-top: 1px solid #3c3c3c; }
-    .menu.button:hover {
-      background-color: #3c3c3c; }
-    .menu.button:insensitive {
+    .menu button.top {
+      border-bottom: 1px solid #3d3d3d; }
+    .menu button.bottom {
+      border-top: 1px solid #3d3d3d; }
+    .menu button:hover {
+      background-color: #3d3d3d; }
+    .menu button:insensitive {
       color: transparent;
       background-color: transparent;
       border-color: transparent; }
@@ -2301,15 +2056,15 @@ column-header .titlebar .button.titlebutton,
   .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  .popover .button.flat, .popover .sidebar-button.button, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
-  .popover .titlebar .titlebutton.button,
-  .titlebar .popover .titlebutton.button,
-  .popover .button.flat:hover,
+  .popover button.flat, .popover .sidebar-button.button, .popover .header-bar button.titlebutton, .header-bar .popover button.titlebutton,
+  .popover .titlebar button.titlebutton,
+  .titlebar .popover button.titlebutton,
+  .popover button.flat:hover,
   .popover .sidebar-button.button:hover,
-  .popover .header-bar .titlebutton.button:hover,
-  .header-bar .popover .titlebutton.button:hover,
-  .popover .titlebar .titlebutton.button:hover,
-  .titlebar .popover .titlebutton.button:hover {
+  .popover .header-bar button.titlebutton:hover,
+  .header-bar .popover button.titlebutton:hover,
+  .popover .titlebar button.titlebutton:hover,
+  .titlebar .popover button.titlebutton:hover {
     text-shadow: none;
     transition: none; }
 
@@ -2341,7 +2096,7 @@ notebook {
     notebook.frame.left {
       border-left-width: 0; }
     notebook.frame:backdrop {
-      border-color: #1e2222; }
+      border-color: #1f2222; }
   notebook.header {
     background-color: #303535; }
     notebook.header.frame {
@@ -2355,25 +2110,25 @@ notebook {
       notebook.header.frame.left {
         border-right-width: 0; }
       notebook.header.frame:backdrop {
-        border-color: #1e2222; }
+        border-color: #1f2222; }
     notebook.header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #1c1f1f; }
       notebook.header.top:backdrop {
-        box-shadow: inset 0 -1px #1e2222; }
+        box-shadow: inset 0 -1px #1f2222; }
     notebook.header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #1c1f1f; }
       notebook.header.bottom:backdrop {
-        box-shadow: inset 0 1px #1e2222; }
+        box-shadow: inset 0 1px #1f2222; }
     notebook.header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #1c1f1f; }
       notebook.header.right:backdrop {
-        box-shadow: inset 1px 0 #1e2222; }
+        box-shadow: inset 1px 0 #1f2222; }
     notebook.header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #1c1f1f; }
       notebook.header.left:backdrop {
-        box-shadow: inset -1px 0 #1e2222; }
+        box-shadow: inset -1px 0 #1f2222; }
     notebook.header:backdrop {
-      background-color: #2f3434;
+      background-color: #303535;
       box-shadow: none; }
   notebook tab {
     border-width: 0;
@@ -2450,7 +2205,7 @@ notebook {
         notebook tab.reorderable-page.top:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         notebook tab.reorderable-page.top:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-bottom-color: #215d9c; }
       notebook tab.reorderable-page.top:backdrop {
@@ -2469,7 +2224,7 @@ notebook {
         notebook tab.reorderable-page.bottom:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         notebook tab.reorderable-page.bottom:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-top-color: #215d9c; }
       notebook tab.reorderable-page.bottom:backdrop {
@@ -2488,7 +2243,7 @@ notebook {
         notebook tab.reorderable-page.left:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         notebook tab.reorderable-page.left:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-right-color: #215d9c; }
       notebook tab.reorderable-page.left:backdrop {
@@ -2507,7 +2262,7 @@ notebook {
         notebook tab.reorderable-page.right:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         notebook tab.reorderable-page.right:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-left-color: #215d9c; }
       notebook tab.reorderable-page.right:backdrop {
@@ -2516,28 +2271,28 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #939695; }
+      color: #949796; }
       notebook tab label:backdrop {
-        color: #787e7e; }
+        color: #797f7f; }
     notebook tab:hover label {
-      color: #c0c2c0; }
+      color: #c1c3c1; }
       notebook tab:hover label:backdrop {
-        color: #787e7e; }
+        color: #797f7f; }
     notebook tab:active label {
       color: #eeeeec; }
       notebook tab:active label:backdrop {
-        color: #939695; }
-    notebook tab .button, notebook tab .header-bar .button.titlebutton, .header-bar notebook tab .button.titlebutton,
-    notebook tab .titlebar .button.titlebutton,
-    .titlebar notebook tab .button.titlebutton {
+        color: #949796; }
+    notebook tab button, notebook tab .header-bar button.titlebutton, .header-bar notebook tab button.titlebutton,
+    notebook tab .titlebar button.titlebutton,
+    .titlebar notebook tab button.titlebutton {
       padding: 0;
       border: 1px solid transparent;
       icon-shadow: none;
       transition: none;
       color: rgba(238, 238, 236, 0.3); }
-      notebook tab .button:hover, notebook tab .header-bar .button.titlebutton:hover, .header-bar notebook tab .button.titlebutton:hover,
-      notebook tab .titlebar .button.titlebutton:hover,
-      .titlebar notebook tab .button.titlebutton:hover {
+      notebook tab button:hover, notebook tab .header-bar button.titlebutton:hover, .header-bar notebook tab button.titlebutton:hover,
+      notebook tab .titlebar button.titlebutton:hover,
+      .titlebar notebook tab button.titlebutton:hover {
         color: #eeeeec;
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
@@ -2548,9 +2303,9 @@ notebook {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         background-image: none;
         box-shadow: none; }
-      notebook tab .button:active, notebook tab .header-bar .button.titlebutton:active, .header-bar notebook tab .button.titlebutton:active,
-      notebook tab .titlebar .button.titlebutton:active,
-      .titlebar notebook tab .button.titlebutton:active {
+      notebook tab button:active, notebook tab .header-bar button.titlebutton:active, .header-bar notebook tab button.titlebutton:active,
+      notebook tab .titlebar button.titlebutton:active,
+      .titlebar notebook tab button.titlebutton:active {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #1c1f1f;
@@ -2558,25 +2313,25 @@ notebook {
         text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-      notebook tab .button:backdrop, notebook tab .header-bar .button.titlebutton:backdrop, .header-bar notebook tab .button.titlebutton:backdrop,
-      notebook tab .titlebar .button.titlebutton:backdrop,
-      .titlebar notebook tab .button.titlebutton:backdrop {
-        color: rgba(147, 150, 149, 0.3);
+      notebook tab button:backdrop, notebook tab .header-bar button.titlebutton:backdrop, .header-bar notebook tab button.titlebutton:backdrop,
+      notebook tab .titlebar button.titlebutton:backdrop,
+      .titlebar notebook tab button.titlebutton:backdrop {
+        color: rgba(148, 151, 150, 0.3);
         border-color: transparent; }
-      notebook tab .button > image, notebook tab .header-bar .button.titlebutton > image, .header-bar notebook tab .button.titlebutton > image,
-      notebook tab .titlebar .button.titlebutton > image,
-      .titlebar notebook tab .button.titlebutton > image {
+      notebook tab button > image, notebook tab .header-bar button.titlebutton > image, .header-bar notebook tab button.titlebutton > image,
+      notebook tab .titlebar button.titlebutton > image,
+      .titlebar notebook tab button.titlebutton > image {
         padding: 2px; }
   notebook.arrow {
-    color: #939695; }
+    color: #949796; }
     notebook.arrow:hover {
-      color: #c0c2c0; }
+      color: #c1c3c1; }
     notebook.arrow:active {
       color: #eeeeec; }
     notebook.arrow:insensitive {
-      color: rgba(147, 150, 149, 0.3); }
+      color: rgba(148, 151, 150, 0.3); }
     notebook.arrow:backdrop {
-      color: rgba(147, 150, 149, 0.4); }
+      color: rgba(148, 151, 150, 0.4); }
       notebook.arrow:backdrop:insensitive {
         color: #5d6767; }
 
@@ -2591,9 +2346,9 @@ notebook {
   -GtkScrollbar-min-slider-length: 42;
   -GtkRange-stepper-spacing: 0;
   -GtkRange-trough-under-steppers: 1; }
-  .scrollbar .button, .scrollbar .header-bar .button.titlebutton, .header-bar .scrollbar .button.titlebutton,
-  .scrollbar .titlebar .button.titlebutton,
-  .titlebar .scrollbar .button.titlebutton {
+  .scrollbar button, .scrollbar .header-bar button.titlebutton, .header-bar .scrollbar button.titlebutton,
+  .scrollbar .titlebar button.titlebutton,
+  .titlebar .scrollbar button.titlebutton {
     border: none; }
   .scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
     opacity: 0.4;
@@ -2619,15 +2374,15 @@ notebook {
     border: 1px none #1c1f1f; }
     .scrollbar .trough:backdrop {
       background-color: #323737;
-      border-color: #1e2222; }
+      border-color: #1f2222; }
   .scrollbar .slider {
-    background-color: #a5a8a6; }
+    background-color: #a6a8a7; }
     .scrollbar .slider:hover {
-      background-color: #c9cbc9; }
+      background-color: #cacbc9; }
     .scrollbar .slider:prelight:active {
       background-color: #2a76c6; }
     .scrollbar .slider:backdrop {
-      background-color: #5d6161; }
+      background-color: #5d6262; }
     .scrollbar .slider:insensitive {
       background-color: transparent; }
   .scrollbar .slider {
@@ -2667,7 +2422,7 @@ notebook {
     border-image-slice: 0 1 0 0; }
   .scrollbars-junction:backdrop,
   .scrollbars-junction.frame:backdrop {
-    border-image-source: linear-gradient(to bottom, #1e2222 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #1f2222 1px, transparent 1px);
     background-color: #323737; }
 
 /**********
@@ -2694,16 +2449,16 @@ switch {
     box-shadow: 0 1px rgba(238, 238, 236, 0.1);
     text-shadow: 0 1px rgba(15, 43, 72, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:insensitive {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
     background-image: none;
-    background-color: #323636;
+    background-color: #333636;
     box-shadow: 0 1px rgba(238, 238, 236, 0.1);
     text-shadow: none; }
   switch:backdrop {
-    color: #939695;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #2f3434);
+    color: #949796;
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #303535);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2712,9 +2467,9 @@ switch {
       box-shadow: none; }
   switch:insensitive {
     color: #5d6767;
-    border-color: #1e2222;
+    border-color: #1f2222;
     background-image: none;
-    background-color: #323636; }
+    background-color: #333636; }
   switch slider {
     border: 1px solid;
     border-radius: 3px;
@@ -2725,7 +2480,7 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; }
   switch:hover slider {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -2734,21 +2489,21 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; }
   switch:active slider {
     border: 1px solid #0f2b48; }
   switch:insensitive slider {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     switch:insensitive slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #939695;
-    border-color: #1e2222;
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
@@ -2758,8 +2513,8 @@ switch {
     border-color: #0f2b48; }
   switch:backdrop:insensitive slider {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
@@ -2773,132 +2528,150 @@ switch {
 .check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check.button.flat, .check.sidebar-button.button, .header-bar .check.titlebutton.button,
-  .titlebar .check.titlebutton.button {
+  .check button.flat, .check .sidebar-button.button, .check .header-bar button.titlebutton, .header-bar .check button.titlebutton,
+  .check .titlebar button.titlebutton,
+  .titlebar .check button.titlebutton {
     icon-shadow: none; }
 
 .check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:hover.button.flat, .check.sidebar-button.button:hover, .header-bar .check.titlebutton.button:hover,
-  .titlebar .check.titlebutton.button:hover {
+  .check:hover button.flat, .check:hover .sidebar-button.button, .check:hover .header-bar button.titlebutton, .header-bar .check:hover button.titlebutton,
+  .check:hover .titlebar button.titlebutton,
+  .titlebar .check:hover button.titlebutton {
     icon-shadow: none; }
 
 .check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:active.button.flat, .check.sidebar-button.button:active, .header-bar .check.titlebutton.button:active,
-  .titlebar .check.titlebutton.button:active {
+  .check:active button.flat, .check:active .sidebar-button.button, .check:active .header-bar button.titlebutton, .header-bar .check:active button.titlebutton,
+  .check:active .titlebar button.titlebutton,
+  .titlebar .check:active button.titlebutton {
     icon-shadow: none; }
 
 .check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:insensitive.button.flat, .check.sidebar-button.button:insensitive, .header-bar .check.titlebutton.button:insensitive,
-  .titlebar .check.titlebutton.button:insensitive {
+  .check:insensitive button.flat, .check:insensitive .sidebar-button.button, .check:insensitive .header-bar button.titlebutton, .header-bar .check:insensitive button.titlebutton,
+  .check:insensitive .titlebar button.titlebutton,
+  .titlebar .check:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-dark.png"), url("assets/checkbox-unchecked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop.button.flat, .check.sidebar-button.button:backdrop, .header-bar .check.titlebutton.button:backdrop,
-  .titlebar .check.titlebutton.button:backdrop {
+  .check:backdrop button.flat, .check:backdrop .sidebar-button.button, .check:backdrop .header-bar button.titlebutton, .header-bar .check:backdrop button.titlebutton,
+  .check:backdrop .titlebar button.titlebutton,
+  .titlebar .check:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive-dark.png"), url("assets/checkbox-unchecked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop:insensitive.button.flat, .check.sidebar-button.button:backdrop:insensitive, .header-bar .check.titlebutton.button:backdrop:insensitive,
-  .titlebar .check.titlebutton.button:backdrop:insensitive {
+  .check:backdrop:insensitive button.flat, .check:backdrop:insensitive .sidebar-button.button, .check:backdrop:insensitive .header-bar button.titlebutton, .header-bar .check:backdrop:insensitive button.titlebutton,
+  .check:backdrop:insensitive .titlebar button.titlebutton,
+  .titlebar .check:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent.button.flat, .check.sidebar-button.button:inconsistent, .header-bar .check.titlebutton.button:inconsistent,
-  .titlebar .check.titlebutton.button:inconsistent {
+  .check:inconsistent button.flat, .check:inconsistent .sidebar-button.button, .check:inconsistent .header-bar button.titlebutton, .header-bar .check:inconsistent button.titlebutton,
+  .check:inconsistent .titlebar button.titlebutton,
+  .titlebar .check:inconsistent button.titlebutton {
     icon-shadow: none; }
 
 .check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent:hover.button.flat, .check.sidebar-button.button:inconsistent:hover, .header-bar .check.titlebutton.button:inconsistent:hover,
-  .titlebar .check.titlebutton.button:inconsistent:hover {
+  .check:inconsistent:hover button.flat, .check:inconsistent:hover .sidebar-button.button, .check:inconsistent:hover .header-bar button.titlebutton, .header-bar .check:inconsistent:hover button.titlebutton,
+  .check:inconsistent:hover .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
 
 .check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent:selected.button.flat, .check.sidebar-button.button:inconsistent:selected, .header-bar .check.titlebutton.button:inconsistent:selected,
-  .titlebar .check.titlebutton.button:inconsistent:selected {
+  .check:inconsistent:selected button.flat, .check:inconsistent:selected .sidebar-button.button, .check:inconsistent:selected .header-bar button.titlebutton, .header-bar .check:inconsistent:selected button.titlebutton,
+  .check:inconsistent:selected .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
 
 .check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-dark.png"), url("assets/checkbox-mixed-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:backdrop.button.flat, .check.sidebar-button.button:inconsistent:backdrop, .header-bar .check.titlebutton.button:inconsistent:backdrop,
-  .titlebar .check.titlebutton.button:inconsistent:backdrop {
+  .check:inconsistent:backdrop button.flat, .check:inconsistent:backdrop .sidebar-button.button, .check:inconsistent:backdrop .header-bar button.titlebutton, .header-bar .check:inconsistent:backdrop button.titlebutton,
+  .check:inconsistent:backdrop .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:inconsistent:insensitive.button.flat, .check.sidebar-button.button:inconsistent:insensitive, .header-bar .check.titlebutton.button:inconsistent:insensitive,
-  .titlebar .check.titlebutton.button:inconsistent:insensitive {
+  .check:inconsistent:insensitive button.flat, .check:inconsistent:insensitive .sidebar-button.button, .check:inconsistent:insensitive .header-bar button.titlebutton, .header-bar .check:inconsistent:insensitive button.titlebutton,
+  .check:inconsistent:insensitive .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive-dark.png"), url("assets/checkbox-mixed-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:insensitive:backdrop.button.flat, .check.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
-  .titlebar .check.titlebutton.button:inconsistent:insensitive:backdrop {
+  .check:inconsistent:insensitive:backdrop button.flat, .check:inconsistent:insensitive:backdrop .sidebar-button.button, .check:inconsistent:insensitive:backdrop .header-bar button.titlebutton, .header-bar .check:inconsistent:insensitive:backdrop button.titlebutton,
+  .check:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked.button.flat, .check.sidebar-button.button:checked, .header-bar .check.titlebutton.button:checked,
-  .titlebar .check.titlebutton.button:checked {
+  .check:checked button.flat, .check:checked .sidebar-button.button, .check:checked .header-bar button.titlebutton, .header-bar .check:checked button.titlebutton,
+  .check:checked .titlebar button.titlebutton,
+  .titlebar .check:checked button.titlebutton {
     icon-shadow: none; }
 
 .check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked:insensitive.button.flat, .check.sidebar-button.button:checked:insensitive, .header-bar .check.titlebutton.button:checked:insensitive,
-  .titlebar .check.titlebutton.button:checked:insensitive {
+  .check:checked:insensitive button.flat, .check:checked:insensitive .sidebar-button.button, .check:checked:insensitive .header-bar button.titlebutton, .header-bar .check:checked:insensitive button.titlebutton,
+  .check:checked:insensitive .titlebar button.titlebutton,
+  .titlebar .check:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked:hover.button.flat, .check.sidebar-button.button:checked:hover, .header-bar .check.titlebutton.button:checked:hover,
-  .titlebar .check.titlebutton.button:checked:hover {
+  .check:checked:hover button.flat, .check:checked:hover .sidebar-button.button, .check:checked:hover .header-bar button.titlebutton, .header-bar .check:checked:hover button.titlebutton,
+  .check:checked:hover .titlebar button.titlebutton,
+  .titlebar .check:checked:hover button.titlebutton {
     icon-shadow: none; }
 
 .check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .check:checked:active.button.flat, .check.sidebar-button.button:checked:active, .header-bar .check.titlebutton.button:checked:active,
-  .titlebar .check.titlebutton.button:checked:active {
+  .check:checked:active button.flat, .check:checked:active .sidebar-button.button, .check:checked:active .header-bar button.titlebutton, .header-bar .check:checked:active button.titlebutton,
+  .check:checked:active .titlebar button.titlebutton,
+  .titlebar .check:checked:active button.titlebutton {
     icon-shadow: none; }
 
 .check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked.button.flat, .check.sidebar-button.button:backdrop:checked, .header-bar .check.titlebutton.button:backdrop:checked,
-  .titlebar .check.titlebutton.button:backdrop:checked {
+  .check:backdrop:checked button.flat, .check:backdrop:checked .sidebar-button.button, .check:backdrop:checked .header-bar button.titlebutton, .header-bar .check:backdrop:checked button.titlebutton,
+  .check:backdrop:checked .titlebar button.titlebutton,
+  .titlebar .check:backdrop:checked button.titlebutton {
     icon-shadow: none; }
 
 .check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"), url("assets/checkbox-checked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked:insensitive.button.flat, .check.sidebar-button.button:backdrop:checked:insensitive, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
-  .titlebar .check.titlebutton.button:backdrop:checked:insensitive {
+  .check:backdrop:checked:insensitive button.flat, .check:backdrop:checked:insensitive .sidebar-button.button, .check:backdrop:checked:insensitive .header-bar button.titlebutton, .header-bar .check:backdrop:checked:insensitive button.titlebutton,
+  .check:backdrop:checked:insensitive .titlebar button.titlebutton,
+  .titlebar .check:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .menu .menuitem.check {
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-  color: #a5a8a6;
+  color: #a6a8a7;
   icon-shadow: none; }
   .menu .menuitem.check:active, .menu .menuitem.check:checked {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
@@ -2907,137 +2680,155 @@ switch {
   .menu .menuitem.check:hover {
     color: #ffffff; }
   .menu .menuitem.check:insensitive {
-    color: #666a6a; }
+    color: #676b6b; }
 
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio.button.flat, .radio.sidebar-button.button, .header-bar .radio.titlebutton.button,
-  .titlebar .radio.titlebutton.button {
+  .radio button.flat, .radio .sidebar-button.button, .radio .header-bar button.titlebutton, .header-bar .radio button.titlebutton,
+  .radio .titlebar button.titlebutton,
+  .titlebar .radio button.titlebutton {
     icon-shadow: none; }
 
 .radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:hover.button.flat, .radio.sidebar-button.button:hover, .header-bar .radio.titlebutton.button:hover,
-  .titlebar .radio.titlebutton.button:hover {
+  .radio:hover button.flat, .radio:hover .sidebar-button.button, .radio:hover .header-bar button.titlebutton, .header-bar .radio:hover button.titlebutton,
+  .radio:hover .titlebar button.titlebutton,
+  .titlebar .radio:hover button.titlebutton {
     icon-shadow: none; }
 
 .radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:active.button.flat, .radio.sidebar-button.button:active, .header-bar .radio.titlebutton.button:active,
-  .titlebar .radio.titlebutton.button:active {
+  .radio:active button.flat, .radio:active .sidebar-button.button, .radio:active .header-bar button.titlebutton, .header-bar .radio:active button.titlebutton,
+  .radio:active .titlebar button.titlebutton,
+  .titlebar .radio:active button.titlebutton {
     icon-shadow: none; }
 
 .radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:insensitive.button.flat, .radio.sidebar-button.button:insensitive, .header-bar .radio.titlebutton.button:insensitive,
-  .titlebar .radio.titlebutton.button:insensitive {
+  .radio:insensitive button.flat, .radio:insensitive .sidebar-button.button, .radio:insensitive .header-bar button.titlebutton, .header-bar .radio:insensitive button.titlebutton,
+  .radio:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-dark.png"), url("assets/radio-unchecked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop.button.flat, .radio.sidebar-button.button:backdrop, .header-bar .radio.titlebutton.button:backdrop,
-  .titlebar .radio.titlebutton.button:backdrop {
+  .radio:backdrop button.flat, .radio:backdrop .sidebar-button.button, .radio:backdrop .header-bar button.titlebutton, .header-bar .radio:backdrop button.titlebutton,
+  .radio:backdrop .titlebar button.titlebutton,
+  .titlebar .radio:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive-dark.png"), url("assets/radio-unchecked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:insensitive.button.flat, .radio.sidebar-button.button:backdrop:insensitive, .header-bar .radio.titlebutton.button:backdrop:insensitive,
-  .titlebar .radio.titlebutton.button:backdrop:insensitive {
+  .radio:backdrop:insensitive button.flat, .radio:backdrop:insensitive .sidebar-button.button, .radio:backdrop:insensitive .header-bar button.titlebutton, .header-bar .radio:backdrop:insensitive button.titlebutton,
+  .radio:backdrop:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent.button.flat, .radio.sidebar-button.button:inconsistent, .header-bar .radio.titlebutton.button:inconsistent,
-  .titlebar .radio.titlebutton.button:inconsistent {
+  .radio:inconsistent button.flat, .radio:inconsistent .sidebar-button.button, .radio:inconsistent .header-bar button.titlebutton, .header-bar .radio:inconsistent button.titlebutton,
+  .radio:inconsistent .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent button.titlebutton {
     icon-shadow: none; }
 
 .radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent:hover.button.flat, .radio.sidebar-button.button:inconsistent:hover, .header-bar .radio.titlebutton.button:inconsistent:hover,
-  .titlebar .radio.titlebutton.button:inconsistent:hover {
+  .radio:inconsistent:hover button.flat, .radio:inconsistent:hover .sidebar-button.button, .radio:inconsistent:hover .header-bar button.titlebutton, .header-bar .radio:inconsistent:hover button.titlebutton,
+  .radio:inconsistent:hover .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
 
 .radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent:selected.button.flat, .radio.sidebar-button.button:inconsistent:selected, .header-bar .radio.titlebutton.button:inconsistent:selected,
-  .titlebar .radio.titlebutton.button:inconsistent:selected {
+  .radio:inconsistent:selected button.flat, .radio:inconsistent:selected .sidebar-button.button, .radio:inconsistent:selected .header-bar button.titlebutton, .header-bar .radio:inconsistent:selected button.titlebutton,
+  .radio:inconsistent:selected .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
 
 .radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-dark.png"), url("assets/radio-mixed-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:backdrop, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
-  .titlebar .radio.titlebutton.button:inconsistent:backdrop {
+  .radio:inconsistent:backdrop button.flat, .radio:inconsistent:backdrop .sidebar-button.button, .radio:inconsistent:backdrop .header-bar button.titlebutton, .header-bar .radio:inconsistent:backdrop button.titlebutton,
+  .radio:inconsistent:backdrop .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:inconsistent:insensitive.button.flat, .radio.sidebar-button.button:inconsistent:insensitive, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
-  .titlebar .radio.titlebutton.button:inconsistent:insensitive {
+  .radio:inconsistent:insensitive button.flat, .radio:inconsistent:insensitive .sidebar-button.button, .radio:inconsistent:insensitive .header-bar button.titlebutton, .header-bar .radio:inconsistent:insensitive button.titlebutton,
+  .radio:inconsistent:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive-dark.png"), url("assets/radio-mixed-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:insensitive:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
-  .titlebar .radio.titlebutton.button:inconsistent:insensitive:backdrop {
+  .radio:inconsistent:insensitive:backdrop button.flat, .radio:inconsistent:insensitive:backdrop .sidebar-button.button, .radio:inconsistent:insensitive:backdrop .header-bar button.titlebutton, .header-bar .radio:inconsistent:insensitive:backdrop button.titlebutton,
+  .radio:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked.button.flat, .radio.sidebar-button.button:checked, .header-bar .radio.titlebutton.button:checked,
-  .titlebar .radio.titlebutton.button:checked {
+  .radio:checked button.flat, .radio:checked .sidebar-button.button, .radio:checked .header-bar button.titlebutton, .header-bar .radio:checked button.titlebutton,
+  .radio:checked .titlebar button.titlebutton,
+  .titlebar .radio:checked button.titlebutton {
     icon-shadow: none; }
 
 .radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked:insensitive.button.flat, .radio.sidebar-button.button:checked:insensitive, .header-bar .radio.titlebutton.button:checked:insensitive,
-  .titlebar .radio.titlebutton.button:checked:insensitive {
+  .radio:checked:insensitive button.flat, .radio:checked:insensitive .sidebar-button.button, .radio:checked:insensitive .header-bar button.titlebutton, .header-bar .radio:checked:insensitive button.titlebutton,
+  .radio:checked:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked:hover.button.flat, .radio.sidebar-button.button:checked:hover, .header-bar .radio.titlebutton.button:checked:hover,
-  .titlebar .radio.titlebutton.button:checked:hover {
+  .radio:checked:hover button.flat, .radio:checked:hover .sidebar-button.button, .radio:checked:hover .header-bar button.titlebutton, .header-bar .radio:checked:hover button.titlebutton,
+  .radio:checked:hover .titlebar button.titlebutton,
+  .titlebar .radio:checked:hover button.titlebutton {
     icon-shadow: none; }
 
 .radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png"));
   icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
-  .radio:checked:active.button.flat, .radio.sidebar-button.button:checked:active, .header-bar .radio.titlebutton.button:checked:active,
-  .titlebar .radio.titlebutton.button:checked:active {
+  .radio:checked:active button.flat, .radio:checked:active .sidebar-button.button, .radio:checked:active .header-bar button.titlebutton, .header-bar .radio:checked:active button.titlebutton,
+  .radio:checked:active .titlebar button.titlebutton,
+  .titlebar .radio:checked:active button.titlebutton {
     icon-shadow: none; }
 
 .radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked.button.flat, .radio.sidebar-button.button:backdrop:checked, .header-bar .radio.titlebutton.button:backdrop:checked,
-  .titlebar .radio.titlebutton.button:backdrop:checked {
+  .radio:backdrop:checked button.flat, .radio:backdrop:checked .sidebar-button.button, .radio:backdrop:checked .header-bar button.titlebutton, .header-bar .radio:backdrop:checked button.titlebutton,
+  .radio:backdrop:checked .titlebar button.titlebutton,
+  .titlebar .radio:backdrop:checked button.titlebutton {
     icon-shadow: none; }
 
 .radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"), url("assets/radio-checked-backdrop-insensitive-dark@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked:insensitive.button.flat, .radio.sidebar-button.button:backdrop:checked:insensitive, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
-  .titlebar .radio.titlebutton.button:backdrop:checked:insensitive {
+  .radio:backdrop:checked:insensitive button.flat, .radio:backdrop:checked:insensitive .sidebar-button.button, .radio:backdrop:checked:insensitive .header-bar button.titlebutton, .header-bar .radio:backdrop:checked:insensitive button.titlebutton,
+  .radio:backdrop:checked:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .menu .menuitem.radio {
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-  color: #a5a8a6;
+  color: #a6a8a7;
   icon-shadow: none; }
   .menu .menuitem.radio:active, .menu .menuitem.radio:checked {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
@@ -3046,7 +2837,7 @@ switch {
   .menu .menuitem.radio:hover {
     color: #ffffff; }
   .menu .menuitem.radio:insensitive {
-    color: #666a6a; }
+    color: #676b6b; }
 
 .view.check, .view.radio,
 .list-row .check, list-row .radio {
@@ -3100,7 +2891,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent {
-    color: #939695; }
+    color: #949796; }
     GtkCheckButton.text-button:insensitive:backdrop, GtkCheckButton.text-button:insensitive:active:backdrop, GtkCheckButton.text-button:insensitive:inconsistent:backdrop, GtkRadioButton.text-button:insensitive:backdrop, GtkRadioButton.text-button:insensitive:active:backdrop, GtkRadioButton.text-button:insensitive:inconsistent:backdrop {
       color: #5d6767; }
 
@@ -3138,7 +2929,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     border: 1px solid;
     border-radius: 50%;
     border-color: #151717;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2a2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2b2f2f; }
     .scale.slider:hover,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:hover,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
@@ -3157,22 +2948,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:insensitive {
       border-style: solid;
       border-radius: 50%;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       box-shadow: none; }
     .scale.slider:backdrop,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #171a1a;
+      border-color: #181a1a;
       background-image: linear-gradient(to bottom, #393f3f);
       box-shadow: none; }
     .scale.slider:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #323636);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -3259,21 +3050,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.vertical:insensitive {
       border-color: #1c1f1f;
       background-image: none;
-      background-color: #323636;
+      background-color: #333636;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
     .scale.trough:backdrop,
     .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-      border-color: #1e2222;
-      background-color: #2a2f2f;
+      border-color: #1f2222;
+      background-color: #2b2f2f;
       box-shadow: none; }
     .scale.trough:backdrop:insensitive, .scale.trough .highlight:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive {
-      border-color: #1e2222;
-      background-color: #323636; }
+      border-color: #1f2222;
+      background-color: #333636; }
     .osd .scale.trough, .osd
     .scale.scale-has-marks-above.scale-has-marks-below.trough, .osd
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
@@ -3327,14 +3118,14 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
       border-color: #215d9c;
       box-shadow: none;
-      background-color: #90aecd;
+      background-color: #90aece;
       background-image: none; }
       .list-row:selected .scale:insensitive:backdrop, .list-row:selected .scale.trough.highlight:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop, .list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop {
-        background-color: #90aecd; }
+        background-color: #90aece; }
 
 .scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
@@ -3589,10 +3380,10 @@ GtkProgressBar {
   GtkProgressBar.trough {
     border: 1px solid #1c1f1f;
     border-radius: 3px;
-    background-color: #2e3333; }
+    background-color: #2f3434; }
     GtkProgressBar.trough:backdrop {
-      border-color: #1e2222;
-      background-color: #2f3434;
+      border-color: #1f2222;
+      background-color: #303535;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
     GtkProgressBar.trough.osd {
       border-style: none;
@@ -3647,15 +3438,15 @@ GtkProgressBar {
     padding: 2px;
     border-radius: 3px;
     background-color: transparent;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .level-bar.trough:backdrop {
       background-color: transparent;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-      color: #d4d4d4;
-      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      color: #d5d5d5;
+      border-color: #1f2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: 0 1px rgba(238, 238, 236, 0); }
   .level-bar.fill-block {
@@ -3685,7 +3476,7 @@ GtkProgressBar {
       border-color: rgba(238, 238, 236, 0.1);
       box-shadow: none; }
       .level-bar.fill-block.empty-fill-block:backdrop {
-        border-color: rgba(147, 150, 149, 0.15); }
+        border-color: rgba(148, 151, 150, 0.15); }
 
 /**********
  * Frames *
@@ -3696,7 +3487,7 @@ GtkProgressBar {
   .frame.flat {
     border-style: none; }
   .frame:backdrop {
-    border-color: #1e2222; }
+    border-color: #1f2222; }
   .frame.action-bar {
     padding: 6px;
     border-width: 1px 0 0; }
@@ -3717,7 +3508,7 @@ separator {
   border-color: #1c1f1f; }
   .list:backdrop {
     background-color: #2c2c2c;
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 
 .list-row,
 .grid-child {
@@ -3732,11 +3523,11 @@ separator {
 .list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 .list-row.activatable:selected.has-open-popup, .list-row.activatable:selected:hover {
-  background-color: #356ba4; }
+  background-color: #366ca4; }
 .list-row.activatable:selected:backdrop {
   background-color: #215d9c; }
 
-.list-row:selected .button {
+.list-row:selected button {
   color: #eeeeec;
   outline-color: rgba(238, 238, 236, 0.3);
   border-color: #1c1f1f;
@@ -3744,9 +3535,9 @@ separator {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-  .list-row:selected .button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
-  .list-row:selected .titlebar .titlebutton.button,
-  .titlebar .list-row:selected .titlebutton.button {
+  .list-row:selected button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar button.titlebutton, .header-bar .list-row:selected button.titlebutton,
+  .list-row:selected .titlebar button.titlebutton,
+  .titlebar .list-row:selected button.titlebutton {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -3754,7 +3545,7 @@ separator {
     text-shadow: none;
     icon-shadow: none;
     color: #ffffff; }
-  .list-row:selected .button:hover {
+  .list-row:selected button:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -3762,7 +3553,7 @@ separator {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-  .list-row:selected .button:active, .list-row:selected .button:checked {
+  .list-row:selected button:active, .list-row:selected button:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -3770,77 +3561,83 @@ separator {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-  .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.button:backdrop,
-  .list-row:selected .titlebar .titlebutton.button:backdrop,
-  .titlebar .list-row:selected .titlebutton.button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+  .list-row:selected button:backdrop, .list-row:selected button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, .list-row:selected .header-bar button.titlebutton:backdrop, .header-bar .list-row:selected button.titlebutton:backdrop,
+  .list-row:selected .titlebar button.titlebutton:backdrop,
+  .titlebar .list-row:selected button.titlebutton:backdrop {
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
-    .list-row:selected .titlebar .titlebutton.button:backdrop:active,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected .button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:checked,
-    .list-row:selected .titlebar .titlebutton.button:backdrop:checked,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:checked {
-      color: #939695;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #2f3434);
+    .list-row:selected button:backdrop:active, .list-row:selected button:backdrop:checked, .list-row:selected button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, .list-row:selected .header-bar button.titlebutton:backdrop:active, .header-bar .list-row:selected button.titlebutton:backdrop:active,
+    .list-row:selected .titlebar button.titlebutton:backdrop:active,
+    .titlebar .list-row:selected button.titlebutton:backdrop:active, .list-row:selected button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected .header-bar button.titlebutton:backdrop:checked, .header-bar .list-row:selected button.titlebutton:backdrop:checked,
+    .list-row:selected .titlebar button.titlebutton:backdrop:checked,
+    .titlebar .list-row:selected button.titlebutton:backdrop:checked {
+      color: #949796;
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .list-row:selected .button:backdrop:insensitive, .list-row:selected .button.flat:backdrop:insensitive, .list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive,
-    .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive {
+    .list-row:selected button:backdrop:insensitive, .list-row:selected button.flat:backdrop:insensitive, .list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive,
+    .list-row:selected .titlebar button.titlebutton:backdrop:insensitive,
+    .titlebar .list-row:selected button.titlebutton:backdrop:insensitive {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #323636);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected .button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive > .label,
-      .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive > .label,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive > .label {
+      .list-row:selected button:backdrop:insensitive > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, .list-row:selected button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive > .label, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
-      .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
-      .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
+      .list-row:selected button:backdrop:insensitive:active, .list-row:selected button:backdrop:insensitive:checked, .list-row:selected button.flat:backdrop:insensitive:active, .list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:active, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive:active,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active,
+      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active, .list-row:selected button.flat:backdrop:insensitive:checked, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:checked, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive:checked,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
+      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:checked {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #262929);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #272929);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected .button:backdrop:insensitive:checked > .label, .list-row:selected .button.flat:backdrop:insensitive:active > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label,
-        .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active > .label,
-        .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, .list-row:selected .button.flat:backdrop:insensitive:checked > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label,
-        .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked > .label,
-        .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label {
+        .list-row:selected button:backdrop:insensitive:active > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, .list-row:selected button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, .list-row:selected button.flat:backdrop:insensitive:active > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:active > .label, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+        .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active > .label, .list-row:selected button.flat:backdrop:insensitive:checked > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:checked > .label, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive:checked > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
+        .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:checked > .label {
           color: inherit; }
-  .list-row:selected .button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.button:backdrop,
-  .list-row:selected .titlebar .titlebutton.button:backdrop,
-  .titlebar .list-row:selected .titlebutton.button:backdrop {
+  .list-row:selected button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, .list-row:selected .header-bar button.titlebutton:backdrop, .header-bar .list-row:selected button.titlebutton:backdrop,
+  .list-row:selected .titlebar button.titlebutton:backdrop,
+  .titlebar .list-row:selected button.titlebutton:backdrop {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #939695; }
-  .list-row:selected .button:insensitive {
-    color: #939695;
+    color: #949796; }
+  .list-row:selected button:insensitive {
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .list-row:selected .button:insensitive > .label {
+    .list-row:selected button:insensitive > .label, .list-row:selected .header-bar button.titlebutton:insensitive > .label,
+    .list-row:selected .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
-    .list-row:selected .button:insensitive:active, .list-row:selected .button:insensitive:checked {
-      color: #939695;
+    .list-row:selected button:insensitive:active, .list-row:selected button:insensitive:checked {
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #2f3333, #323636);
+      background-image: linear-gradient(to bottom, #313434, #333636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .list-row:selected .button:insensitive:active > .label, .list-row:selected .button:insensitive:checked > .label {
+      .list-row:selected button:insensitive:active > .label, .list-row:selected .header-bar button.titlebutton:insensitive:active > .label,
+      .list-row:selected .titlebar button.titlebutton:insensitive:active > .label, .list-row:selected button:insensitive:checked > .label, .list-row:selected .header-bar button.titlebutton:insensitive:checked > .label,
+      .list-row:selected .titlebar button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
 .list-row {
@@ -3862,10 +3659,10 @@ separator {
   .app-notification:backdrop,
   .app-notification.frame:backdrop {
     background-image: none; }
-  .app-notification .button, .app-notification .header-bar .button.titlebutton, .header-bar .app-notification .button.titlebutton,
-  .app-notification .titlebar .button.titlebutton,
-  .titlebar .app-notification .button.titlebutton,
-  .app-notification.frame .button {
+  .app-notification button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification button.titlebutton,
+  .app-notification .titlebar button.titlebutton,
+  .titlebar .app-notification button.titlebutton,
+  .app-notification.frame button {
     color: #eeeeec;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -3874,19 +3671,19 @@ separator {
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
-    .app-notification .titlebar .titlebutton.button,
-    .titlebar .app-notification .titlebutton.button,
-    .app-notification.frame .button.flat,
+    .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification button.titlebutton,
+    .app-notification .titlebar button.titlebutton,
+    .titlebar .app-notification button.titlebutton,
+    .app-notification.frame button.flat,
     .app-notification.frame .sidebar-button.button,
-    .app-notification.frame .header-bar .titlebutton.button,
-    .header-bar .app-notification.frame .titlebutton.button,
-    .app-notification.frame .titlebar .titlebutton.button,
-    .titlebar .app-notification.frame .titlebutton.button {
+    .app-notification.frame .header-bar button.titlebutton,
+    .header-bar .app-notification.frame button.titlebutton,
+    .app-notification.frame .titlebar button.titlebutton,
+    .titlebar .app-notification.frame button.titlebutton {
       icon-shadow: 0 1px black;
       text-shadow: 0 1px black; }
-    .app-notification .button:hover,
-    .app-notification.frame .button:hover {
+    .app-notification button:hover,
+    .app-notification.frame button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -3895,11 +3692,11 @@ separator {
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button:active, .app-notification .button:checked, .app-notification .button:backdrop:active, .app-notification .button:backdrop:checked,
-    .app-notification.frame .button:active,
-    .app-notification.frame .button:checked,
-    .app-notification.frame .button:backdrop:active,
-    .app-notification.frame .button:backdrop:checked {
+    .app-notification button:active, .app-notification button:checked, .app-notification button:backdrop:active, .app-notification button:backdrop:checked,
+    .app-notification.frame button:active,
+    .app-notification.frame button:checked,
+    .app-notification.frame button:backdrop:active,
+    .app-notification.frame button:backdrop:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -3908,18 +3705,18 @@ separator {
       text-shadow: none;
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
-    .app-notification.frame .button:insensitive,
-    .app-notification.frame .button:backdrop:insensitive {
-      color: #878989;
+    .app-notification button:insensitive, .app-notification button:backdrop:insensitive,
+    .app-notification.frame button:insensitive,
+    .app-notification.frame button:backdrop:insensitive {
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .app-notification .button:backdrop,
-    .app-notification.frame .button:backdrop {
+    .app-notification button:backdrop,
+    .app-notification.frame button:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -3951,31 +3748,27 @@ calendar {
     border-radius: 0; }
     calendar.header:backdrop {
       border-color: rgba(0, 0, 0, 0.1); }
-  calendar.button, .header-bar calendar.button.titlebutton,
-  .titlebar calendar.button.titlebutton {
+  calendar.button {
     color: rgba(238, 238, 236, 0.45); }
-    calendar.button:hover, .header-bar calendar.button.titlebutton:hover,
-    .titlebar calendar.button.titlebutton:hover {
+    calendar.button:hover {
       color: #eeeeec; }
-    calendar.button:backdrop, .header-bar calendar.button.titlebutton:backdrop,
-    .titlebar calendar.button.titlebutton:backdrop {
-      color: rgba(147, 150, 149, 0.45); }
-    calendar.button:insensitive, .header-bar calendar.button.titlebutton:insensitive,
-    .titlebar calendar.button.titlebutton:insensitive {
-      color: rgba(147, 150, 149, 0.45); }
+    calendar.button:backdrop {
+      color: rgba(148, 151, 150, 0.45); }
+    calendar.button:insensitive {
+      color: rgba(148, 151, 150, 0.45); }
   calendar:inconsistent, calendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #eeeeec; }
   calendar:backdrop {
-    color: #d4d4d4;
-    border-color: #1e2222; }
+    color: #d5d5d5;
+    border-color: #1f2222; }
 
 /***********
  * Dialogs *
  ***********/
-.message-dialog .dialog-action-area .button {
+.message-dialog .dialog-action-area button {
   padding: 8px; }
 
 .message-dialog .titlebar {
@@ -3984,7 +3777,7 @@ calendar {
 .message-dialog.csd.background {
   border-bottom-left-radius: 9px;
   border-bottom-right-radius: 9px; }
-.message-dialog.csd .dialog-action-area .button {
+.message-dialog.csd .dialog-action-area button {
   padding: 12px;
   border-radius: 0;
   color: #eeeeec;
@@ -3994,7 +3787,7 @@ calendar {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-  .message-dialog.csd .dialog-action-area .button:hover {
+  .message-dialog.csd .dialog-action-area button:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -4002,7 +3795,7 @@ calendar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-  .message-dialog.csd .dialog-action-area .button:active {
+  .message-dialog.csd .dialog-action-area button:active {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -4010,32 +3803,34 @@ calendar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-  .message-dialog.csd .dialog-action-area .button:insensitive {
-    color: #939695;
+  .message-dialog.csd .dialog-action-area button:insensitive {
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area .button:insensitive > .label {
+    .message-dialog.csd .dialog-action-area button:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.titlebutton:insensitive > .label,
+    .message-dialog.csd .dialog-action-area .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
-  .message-dialog.csd .dialog-action-area .button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+  .message-dialog.csd .dialog-action-area button:backdrop {
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
+  .message-dialog.csd .dialog-action-area button:backdrop:insensitive {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label {
+    .message-dialog.csd .dialog-action-area button:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.titlebutton:backdrop:insensitive > .label,
+    .message-dialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:insensitive > .label {
       color: inherit; }
-  .message-dialog.csd .dialog-action-area .button.suggested-action {
+  .message-dialog.csd .dialog-action-area button.suggested-action {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #0b1e33;
@@ -4043,7 +3838,7 @@ calendar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-    .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
+    .message-dialog.csd .dialog-action-area button.suggested-action:hover {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0b1e33;
@@ -4051,7 +3846,7 @@ calendar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-    .message-dialog.csd .dialog-action-area .button.suggested-action:active {
+    .message-dialog.csd .dialog-action-area button.suggested-action:active {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0b1e33;
@@ -4059,32 +3854,34 @@ calendar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-    .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
-      color: #d2deeb;
+    .message-dialog.csd .dialog-action-area button.suggested-action:backdrop {
+      color: #d3dfeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
+      .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label {
+        .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .message-dialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-    .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
-      color: #939695;
+    .message-dialog.csd .dialog-action-area button.suggested-action:insensitive {
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label {
+      .message-dialog.csd .dialog-action-area button.suggested-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.suggested-action.titlebutton:insensitive > .label,
+      .message-dialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:insensitive > .label {
         color: inherit; }
-  .message-dialog.csd .dialog-action-area .button.destructive-action {
+  .message-dialog.csd .dialog-action-area button.destructive-action {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5e0707;
@@ -4092,7 +3889,7 @@ calendar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
-    .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
+    .message-dialog.csd .dialog-action-area button.destructive-action:hover {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #5e0707;
@@ -4100,7 +3897,7 @@ calendar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); }
-    .message-dialog.csd .dialog-action-area .button.destructive-action:active {
+    .message-dialog.csd .dialog-action-area button.destructive-action:active {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #5e0707;
@@ -4108,39 +3905,41 @@ calendar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-    .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
-      color: #f6cfcf;
+    .message-dialog.csd .dialog-action-area button.destructive-action:backdrop {
+      color: #f7cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
+      .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label {
+        .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .message-dialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-    .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
-      color: #939695;
+    .message-dialog.csd .dialog-action-area button.destructive-action:insensitive {
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label {
+      .message-dialog.csd .dialog-action-area button.destructive-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.destructive-action.titlebutton:insensitive > .label,
+      .message-dialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:insensitive > .label {
         color: inherit; }
-.message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
+.message-dialog.csd .dialog-action-area button, .message-dialog.csd .dialog-action-area button:hover, .message-dialog.csd .dialog-action-area button:active, .message-dialog.csd .dialog-action-area button:insensitive, .message-dialog.csd .dialog-action-area button:backdrop, .message-dialog.csd .dialog-action-area button:backdrop:insensitive, .message-dialog.csd .dialog-action-area button.suggested-action, .message-dialog.csd .dialog-action-area button.suggested-action:hover, .message-dialog.csd .dialog-action-area button.suggested-action:active, .message-dialog.csd .dialog-action-area button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area button.destructive-action, .message-dialog.csd .dialog-action-area button.destructive-action:hover, .message-dialog.csd .dialog-action-area button.destructive-action:active, .message-dialog.csd .dialog-action-area button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area button.destructive-action:insensitive {
   border-left-style: solid;
   border-right-style: none;
   border-bottom-style: none; }
-.message-dialog.csd .dialog-action-area .button:last-child {
+.message-dialog.csd .dialog-action-area button:last-child {
   border-bottom-right-radius: 7px;
   outline-bottom-right-radius: 5px; }
-.message-dialog.csd .dialog-action-area .button:first-child {
+.message-dialog.csd .dialog-action-area button:first-child {
   border-left-style: none;
   border-bottom-left-radius: 7px;
   outline-bottom-left-radius: 5px; }
@@ -4155,7 +3954,7 @@ GtkFileChooserDialog .search-bar {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #1c1f1f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #1e2222; }
+    border-top-color: #1f2222; }
 
 /***********
  * Sidebar *
@@ -4164,7 +3963,7 @@ GtkFileChooserDialog .dialog-action-box {
   border: none;
   background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #323535; }
+    background-color: #333636; }
 
 GtkSidebarRow.list-row {
   padding: 0px; }
@@ -4187,13 +3986,12 @@ GtkPlacesSidebar.sidebar .sidebar-placeholder-row {
   border: solid 1px #215d9c; }
 GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
   color: #215d9c; }
-.sidebar-button.button, .header-bar .sidebar-button.button.titlebutton,
-.titlebar .sidebar-button.button.titlebutton {
+.sidebar-button.button {
   border-radius: 100%;
   outline-radius: 100%; }
   .sidebar-button.button.image-button, GtkScaleButton.sidebar-button.button,
-  GtkVolumeButton.sidebar-button.button, .header-bar .sidebar-button.titlebutton.button,
-  .titlebar .sidebar-button.titlebutton.button {
+  GtkVolumeButton.sidebar-button.button, .header-bar button.sidebar-button.button.titlebutton,
+  .titlebar button.sidebar-button.button.titlebutton {
     padding: 5px; }
   .sidebar-button.button:not(:hover):not(:active) > image, .sidebar-button.button:backdrop > image {
     opacity: 0.7; }
@@ -4231,7 +4029,7 @@ GtkPaned {
   GtkPaned .pane-separator {
     background-color: #1c1f1f; }
     GtkPaned .pane-separator:backdrop {
-      background-color: #1e2222; }
+      background-color: #1f2222; }
 
 GtkPaned.wide {
   -GtkPaned-handle-size: 5;
@@ -4244,7 +4042,7 @@ GtkPaned.wide {
   GtkPaned.wide.vertical .pane-separator {
     border-style: solid none; }
   GtkPaned.wide .pane-separator:backdrop {
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 
 /**************
  * GtkInfoBar *
@@ -4260,24 +4058,24 @@ infobar {
   color: #ffffff;
   text-shadow: 0 1px #184472;
   border-color: #184472; }
-  .info .button, .info .header-bar .button.titlebutton, .header-bar .info .button.titlebutton,
-  .info .titlebar .button.titlebutton,
-  .titlebar .info .button.titlebutton,
-  .question .button,
-  .question .header-bar .button.titlebutton,
-  .header-bar .question .button.titlebutton,
-  .question .titlebar .button.titlebutton,
-  .titlebar .question .button.titlebutton,
-  .warning .button,
-  .warning .header-bar .button.titlebutton,
-  .header-bar .warning .button.titlebutton,
-  .warning .titlebar .button.titlebutton,
-  .titlebar .warning .button.titlebutton,
-  .error .button,
-  .error .header-bar .button.titlebutton,
-  .header-bar .error .button.titlebutton,
-  .error .titlebar .button.titlebutton,
-  .titlebar .error .button.titlebutton {
+  .info button, .info .header-bar button.titlebutton, .header-bar .info button.titlebutton,
+  .info .titlebar button.titlebutton,
+  .titlebar .info button.titlebutton,
+  .question button,
+  .question .header-bar button.titlebutton,
+  .header-bar .question button.titlebutton,
+  .question .titlebar button.titlebutton,
+  .titlebar .question button.titlebutton,
+  .warning button,
+  .warning .header-bar button.titlebutton,
+  .header-bar .warning button.titlebutton,
+  .warning .titlebar button.titlebutton,
+  .titlebar .warning button.titlebutton,
+  .error button,
+  .error .header-bar button.titlebutton,
+  .header-bar .error button.titlebutton,
+  .error .titlebar button.titlebutton,
+  .titlebar .error button.titlebutton {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #0b1e33;
@@ -4285,10 +4083,10 @@ infobar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-    .info .button:hover,
-    .question .button:hover,
-    .warning .button:hover,
-    .error .button:hover {
+    .info button:hover,
+    .question button:hover,
+    .warning button:hover,
+    .error button:hover {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0b1e33;
@@ -4296,10 +4094,10 @@ infobar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.67153);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
-    .info .button:active,
-    .question .button:active,
-    .warning .button:active,
-    .error .button:active {
+    .info button:active,
+    .question button:active,
+    .warning button:active,
+    .error button:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0b1e33;
@@ -4307,47 +4105,61 @@ infobar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-    .info .button:insensitive,
-    .question .button:insensitive,
-    .warning .button:insensitive,
-    .error .button:insensitive {
-      color: #90aac4;
+    .info button:insensitive,
+    .question button:insensitive,
+    .warning button:insensitive,
+    .error button:insensitive {
+      color: #91aac5;
       border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #22558a);
+      background-image: linear-gradient(to bottom, #22558b);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info .button:insensitive > .label,
-      .question .button:insensitive > .label,
-      .warning .button:insensitive > .label,
-      .error .button:insensitive > .label {
+      .info button:insensitive > .label, .info .header-bar button.titlebutton:insensitive > .label,
+      .info .titlebar button.titlebutton:insensitive > .label,
+      .question button:insensitive > .label,
+      .question .header-bar button.titlebutton:insensitive > .label,
+      .question .titlebar button.titlebutton:insensitive > .label,
+      .warning button:insensitive > .label,
+      .warning .header-bar button.titlebutton:insensitive > .label,
+      .warning .titlebar button.titlebutton:insensitive > .label,
+      .error button:insensitive > .label,
+      .error .header-bar button.titlebutton:insensitive > .label,
+      .error .titlebar button.titlebutton:insensitive > .label {
         color: inherit; }
-    .info .button:backdrop,
-    .question .button:backdrop,
-    .warning .button:backdrop,
-    .error .button:backdrop {
-      color: #d2deeb;
+    .info button:backdrop,
+    .question button:backdrop,
+    .warning button:backdrop,
+    .error button:backdrop {
+      color: #d3dfeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #0b1e33; }
-      .info .button:backdrop:insensitive,
-      .question .button:backdrop:insensitive,
-      .warning .button:backdrop:insensitive,
-      .error .button:backdrop:insensitive {
-        color: #6f90b2;
+      .info button:backdrop:insensitive,
+      .question button:backdrop:insensitive,
+      .warning button:backdrop:insensitive,
+      .error button:backdrop:insensitive {
+        color: #6f91b4;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558a);
+        background-image: linear-gradient(to bottom, #22558b);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0b1e33; }
-        .info .button:backdrop:insensitive > .label,
-        .question .button:backdrop:insensitive > .label,
-        .warning .button:backdrop:insensitive > .label,
-        .error .button:backdrop:insensitive > .label {
+        .info button:backdrop:insensitive > .label, .info .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .info .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .question button:backdrop:insensitive > .label,
+        .question .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .question .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .warning button:backdrop:insensitive > .label,
+        .warning .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .warning .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .error button:backdrop:insensitive > .label,
+        .error .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .error .titlebar button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4471,8 +4283,8 @@ GtkColorSwatch {
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
     GtkColorSwatch#add-color-button:backdrop {
-      color: #939695;
-      border-color: #1e2222;
+      color: #949796;
+      border-color: #1f2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
@@ -4495,17 +4307,17 @@ GtkColorSwatch {
   .content-view:backdrop {
     background-color: #282c2c; }
 
-.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
-.osd .scale-popup .titlebar .titlebutton.button,
-.titlebar .osd .scale-popup .titlebutton.button {
+.osd .scale-popup button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar button.titlebutton, .header-bar .osd .scale-popup button.titlebutton,
+.osd .scale-popup .titlebar button.titlebutton,
+.titlebar .osd .scale-popup button.titlebutton {
   padding: 6px;
   border-style: none;
   border-radius: 5px; }
-.scale-popup .button, .scale-popup .header-bar .button.titlebutton, .header-bar .scale-popup .button.titlebutton,
-.scale-popup .titlebar .button.titlebutton,
-.titlebar .scale-popup .button.titlebutton {
+.scale-popup button, .scale-popup .header-bar button.titlebutton, .header-bar .scale-popup button.titlebutton,
+.scale-popup .titlebar button.titlebutton,
+.titlebar .scale-popup button.titlebutton {
   padding: 6px; }
-  .scale-popup .button:hover {
+  .scale-popup button:hover {
     background-color: rgba(238, 238, 236, 0.1);
     border-radius: 5px; }
 
@@ -4539,38 +4351,34 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;
-    border: solid 1px #1e2222;
+    border: solid 1px #1f2222;
     box-shadow: none; }
 
-.header-bar .titlebutton.button,
-.titlebar .titlebutton.button {
+.header-bar button.titlebutton,
+.titlebar button.titlebutton {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
-  .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop {
+  .header-bar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop {
     icon-shadow: none; }
 
-.header-bar.selection-mode .titlebutton.button,
-.titlebar.selection-mode .titlebutton.button {
+.header-bar.selection-mode button.titlebutton,
+.titlebar.selection-mode button.titlebutton {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353); }
-  .header-bar.selection-mode .titlebutton.button:backdrop,
-  .titlebar.selection-mode .titlebutton.button:backdrop {
+  .header-bar.selection-mode button.titlebutton:backdrop,
+  .titlebar.selection-mode button.titlebutton:backdrop {
     icon-shadow: none; }
 
-.view:selected, calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, entry:selected:focus, spinbutton:selected, spinbutton:selected:focus, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .header-bar .menuitem.titlebutton.button:selected,
-.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected {
+.view:selected, calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, entry:selected:focus, spinbutton:selected, spinbutton:selected:focus, .menuitem.button.flat:selected, .list-row:selected, .sidebar:selected {
   background-color: #215d9c;
   color: #ffffff; }
-  .view:insensitive:selected, calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, .menuitem.button.flat:insensitive:selected, .menuitem.sidebar-button.button:insensitive:selected, .header-bar .menuitem.titlebutton.button:insensitive:selected,
-  .titlebar .menuitem.titlebutton.button:insensitive:selected, .list-row:insensitive:selected, .sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label {
-    color: #90aecd; }
-  .view:backdrop:selected, calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, .menuitem.button.flat:backdrop:selected, .menuitem.sidebar-button.button:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
-  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected {
+  .view:insensitive:selected, calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, .menuitem.button.flat:insensitive:selected, .list-row:insensitive:selected, .sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label {
+    color: #90aece; }
+  .view:backdrop:selected, calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, .menuitem.button.flat:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected {
     color: #ffffff; }
-    .view:backdrop:insensitive:selected, calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, .menuitem.sidebar-button.button:backdrop:insensitive:selected, .header-bar .menuitem.titlebutton.button:backdrop:insensitive:selected,
-    .titlebar .menuitem.titlebutton.button:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label:backdrop, GtkPlacesSidebar.sidebar .list-row:selected:backdrop:insensitive label {
-      color: #638db9; }
+    .view:backdrop:insensitive:selected, calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label:backdrop, GtkPlacesSidebar.sidebar .list-row:selected:backdrop:insensitive label {
+      color: #648eba; }
 
 .monospace {
   font: Monospace; }
@@ -4643,9 +4451,9 @@ entry.cursor-handle,
   icon-shadow: 0 1px black; }
   .touch-selection:backdrop {
     text-shadow: none; }
-  .touch-selection .button, .touch-selection .header-bar .button.titlebutton, .header-bar .touch-selection .button.titlebutton,
-  .touch-selection .titlebar .button.titlebutton,
-  .titlebar .touch-selection .button.titlebutton {
+  .touch-selection button, .touch-selection .header-bar button.titlebutton, .header-bar .touch-selection button.titlebutton,
+  .touch-selection .titlebar button.titlebutton,
+  .titlebar .touch-selection button.titlebutton {
     color: #eeeeec;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -4654,7 +4462,7 @@ entry.cursor-handle,
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .touch-selection .button:hover {
+    .touch-selection button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -4663,7 +4471,7 @@ entry.cursor-handle,
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .touch-selection .button:active, .touch-selection .button:checked {
+    .touch-selection button:active, .touch-selection button:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -4672,15 +4480,15 @@ entry.cursor-handle,
       text-shadow: none;
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
-      color: #878989;
+    .touch-selection button:insensitive, .touch-selection button:backdrop:insensitive {
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .touch-selection .button:backdrop {
+    .touch-selection button:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -4776,7 +4584,7 @@ entry.cursor-handle,
   border: none;
   box-shadow: none; }
   .overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -4792,7 +4600,7 @@ entry.cursor-handle,
   border: none;
   box-shadow: none; }
   .overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -4808,7 +4616,7 @@ entry.cursor-handle,
   border: none;
   box-shadow: none; }
   .overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -4824,7 +4632,7 @@ entry.cursor-handle,
   border: none;
   box-shadow: none; }
   .overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -4865,13 +4673,13 @@ entry.cursor-handle,
   background-origin: content-box;
   background-position: right center; }
 
-.button.circular, .header-bar .circular.button.titlebutton,
-.titlebar .circular.button.titlebutton {
+button.circular, .header-bar button.circular.titlebutton,
+.titlebar button.circular.titlebutton {
   border-radius: 20px;
   outline-radius: 20px; }
 
-.button.circular label, .header-bar .circular.button.titlebutton label,
-.titlebar .circular.button.titlebutton label {
+button.circular label, .header-bar button.circular.titlebutton label,
+.titlebar button.circular.titlebutton label {
   padding: 0; }
 
 .frame.keycap {
@@ -4905,16 +4713,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
-@define-color insensitive_bg_color #323636;
+@define-color insensitive_bg_color #333636;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #939695;
+@define-color insensitive_fg_color #949796;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #292929;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #939695;
+@define-color theme_unfocused_fg_color #949796;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color white;
@@ -4935,7 +4743,7 @@ widgets main borders color */
 @define-color borders #1c1f1f;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #1e2222;
+@define-color unfocused_borders #1f2222;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4945,7 +4753,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#eeeeec, 1.8);
-@define-color wm_unfocused_title #939695;
+@define-color wm_unfocused_title #949796;
 @define-color wm_highlight transparent;
 @define-color wm_borders_edge rgba(238, 238, 236, 0.1);
 @define-color wm_bg_a shade(#393f3f, 1.2);

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index e05c5073a6970b8f2270658bb640acc561c73f99..573a6d1f7815b9b7a55385b3cba76729471490fd 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -36,7 +36,7 @@
   .background:backdrop {
     text-shadow: none;
     icon-shadow: none;
-    color: #8d9091;
+    color: #8e9192;
     background-color: #ededed; }
 
 /*
@@ -55,11 +55,11 @@
     background-color: white;
     color: #2e3436; }
   .gtkstyle-fallback:active {
-    background-color: lightgray;
+    background-color: #d4d4d4;
     color: #2e3436; }
   .gtkstyle-fallback:insensitive {
     background-color: #f4f4f4;
-    color: #8d9091; }
+    color: #8e9192; }
   .gtkstyle-fallback:selected {
     background-color: #4a90d9;
     color: #ffffff; }
@@ -68,7 +68,7 @@
   color: black;
   background-color: #ffffff; }
   .view:backdrop {
-    color: #323232;
+    color: #333333;
     background-color: white; }
   .view:selected, calendar:selected {
     border-radius: 3px; }
@@ -80,9 +80,9 @@
 label.separator {
   color: #2e3436; }
   label.separator:backdrop {
-    color: #8d9091; }
+    color: #8e9192; }
 label:insensitive {
-  color: #8d9091; }
+  color: #8e9192; }
   label:insensitive:backdrop {
     color: #c7c7c7; }
 
@@ -100,13 +100,13 @@ assistant .sidebar {
     border-left: 1px solid #a1a1a1; }
   assistant .sidebar:backdrop {
     background-color: white;
-    border-color: #a8a8a8; }
+    border-color: darkgray; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #c6c8c8; }
+  background-color: #c7c8c8; }
 
 GtkTextView {
   background-color: #f6f6f6; }
@@ -185,22 +185,22 @@ entry, spinbutton {
   entry:insensitive, spinbutton:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #8d9091;
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px white; }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-    color: #323232;
-    border-color: #a8a8a8;
+    color: #333333;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, white);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry:backdrop:insensitive, spinbutton:backdrop:insensitive {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry progress, spinbutton progress {
@@ -214,7 +214,7 @@ entry, spinbutton {
     box-shadow: none; }
     entry progress:backdrop, spinbutton progress:backdrop {
       background-color: transparent; }
-  .linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > entry:focus + .button, .linked:not(.vertical) > entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > entry:focus + GtkComboBoxText > .the-button-in-the-combobox, .linked:not(.vertical) > spinbutton:focus + entry, .linked:not(.vertical) > spinbutton:focus + .button, .linked:not(.vertical) > spinbutton:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > spinbutton:focus + GtkComboBoxText > .the-button-in-the-combobox {
+  .linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > entry:focus + GtkComboBoxText > .the-button-in-the-combobox, .linked:not(.vertical) > spinbutton:focus + entry, .linked:not(.vertical) > spinbutton:focus + button, .linked:not(.vertical) > spinbutton:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > spinbutton:focus + GtkComboBoxText > .the-button-in-the-combobox {
     border-left-color: #4a90d9; }
   entry.error, spinbutton.error {
     color: #cc0000;
@@ -237,13 +237,13 @@ entry, spinbutton {
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
   entry image, spinbutton image {
-    color: #575c5e; }
+    color: #585d5e; }
     entry image:hover, spinbutton image:hover {
       color: #2e3436; }
     entry image:active, spinbutton image:active {
       color: #4a90d9; }
     entry image:backdrop, spinbutton image:backdrop {
-      color: #a3a6a7; }
+      color: #a5a7a8; }
   .osd entry, .osd spinbutton {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
@@ -277,9 +277,9 @@ entry, spinbutton {
     .osd entry:insensitive, .osd spinbutton:insensitive {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -290,10 +290,10 @@ entry, spinbutton {
 .linked.vertical > entry:focus:not(:last-child) {
   box-shadow: inset 0 0 0 1px #4a90d9; }
 .linked.vertical > entry:not(:insensitive) + entry:not(:insensitive) {
-  border-top-color: #e2e2e2;
+  border-top-color: #e3e3e3;
   background-image: linear-gradient(to bottom, #ffffff); }
   .linked.vertical > entry:not(:insensitive) + entry:not(:insensitive):backdrop {
-    border-top-color: #e4e4e4;
+    border-top-color: #e5e5e5;
     background-image: linear-gradient(to bottom, white); }
 .linked.vertical > entry + entry:focus:not(:last-child) {
   border-top-color: #4a90d9;
@@ -301,7 +301,7 @@ entry, spinbutton {
 .linked.vertical > entry + entry:focus:last-child {
   border-top-color: #4a90d9; }
 .linked.vertical > entry:focus:not(:only-child) + entry,
-.linked.vertical > entry:focus:not(:only-child) + .button,
+.linked.vertical > entry:focus:not(:only-child) + button,
 .linked.vertical > entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
 .linked.vertical > entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
   border-top-color: #4a90d9; }
@@ -314,10 +314,8 @@ entry, spinbutton {
     background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#4a90d9), to(transparent)); }
   to {
     background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#4a90d9), to(transparent)); } }
-button,
-.button,
-.header-bar .button.titlebutton,
-.titlebar .button.titlebutton {
+button, .header-bar button.titlebutton,
+.titlebar button.titlebutton {
   border: 1px solid;
   border-radius: 3px;
   padding: 5px 8px 6px;
@@ -329,11 +327,8 @@ button,
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white, 0 1px white; }
-  button.flat,
-  .button.flat,
-  .sidebar-button.button,
-  .header-bar .titlebutton.button,
-  .titlebar .titlebutton.button {
+  button.flat, .sidebar-button.button, .header-bar button.titlebutton,
+  .titlebar button.titlebutton {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -341,23 +336,15 @@ button,
     text-shadow: none;
     icon-shadow: none;
     transition: none; }
-    button.flat:hover,
-    .button.flat:hover,
-    .sidebar-button.button:hover,
-    .header-bar .titlebutton.button:hover,
-    .titlebar .titlebutton.button:hover {
+    button.flat:hover, .sidebar-button.button:hover, .header-bar button.titlebutton:hover,
+    .titlebar button.titlebutton:hover {
       transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
       transition-duration: 500ms; }
-      button.flat:hover:active,
-      .button.flat:hover:active,
-      .sidebar-button.button:hover:active,
-      .header-bar .titlebutton.button:hover:active,
-      .titlebar .titlebutton.button:hover:active {
+      button.flat:hover:active, .sidebar-button.button:hover:active, .header-bar button.titlebutton:hover:active,
+      .titlebar button.titlebutton:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
-  button:hover,
-  .button:hover,
-  .header-bar .button.titlebutton:hover,
-  .titlebar .button.titlebutton:hover {
+  button:hover, .header-bar button.titlebutton:hover,
+  .titlebar button.titlebutton:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -366,13 +353,9 @@ button,
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px white;
     -gtk-image-effect: highlight; }
-  button:active, button:checked,
-  .button:active,
-  .header-bar .button.titlebutton:active,
-  .titlebar .button.titlebutton:active,
-  .button:checked,
-  .header-bar .button.titlebutton:checked,
-  .titlebar .button.titlebutton:checked {
+  button:active, .header-bar button.titlebutton:active,
+  .titlebar button.titlebutton:active, button:checked, .header-bar button.titlebutton:checked,
+  .titlebar button.titlebutton:checked {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -381,129 +364,80 @@ button,
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white;
     transition-duration: 50ms; }
-  button:backdrop, button.flat:backdrop,
-  .button:backdrop,
-  .header-bar .button.titlebutton:backdrop,
-  .titlebar .button.titlebutton:backdrop,
-  .button.flat:backdrop,
-  .sidebar-button.button:backdrop,
-  .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
+  button:backdrop, .header-bar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop {
+    color: #8e9192;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     -gtk-image-effect: none; }
-    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.flat:backdrop:checked,
-    .button:backdrop:active,
-    .button:backdrop:checked,
-    .button.flat:backdrop:active,
-    .sidebar-button.button:backdrop:active,
-    .header-bar .titlebutton.button:backdrop:active,
-    .titlebar .titlebutton.button:backdrop:active,
-    .button.flat:backdrop:checked,
-    .sidebar-button.button:backdrop:checked,
-    .header-bar .titlebutton.button:backdrop:checked,
-    .titlebar .titlebutton.button:backdrop:checked {
-      color: #8d9091;
-      border-color: #a8a8a8;
-      background-image: linear-gradient(to bottom, #d4d4d4);
+    button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, .sidebar-button.button:backdrop:active, .header-bar button.titlebutton:backdrop:active,
+    .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, .sidebar-button.button:backdrop:checked, .header-bar button.titlebutton:backdrop:checked,
+    .titlebar button.titlebutton:backdrop:checked {
+      color: #8e9192;
+      border-color: darkgray;
+      background-image: linear-gradient(to bottom, #d5d5d5);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    button:backdrop:insensitive, button.flat:backdrop:insensitive,
-    .button:backdrop:insensitive,
-    .button.flat:backdrop:insensitive,
-    .sidebar-button.button:backdrop:insensitive,
-    .header-bar .titlebutton.button:backdrop:insensitive,
-    .titlebar .titlebutton.button:backdrop:insensitive {
+    button:backdrop:insensitive, button.flat:backdrop:insensitive, .sidebar-button.button:backdrop:insensitive, .header-bar button.titlebutton:backdrop:insensitive,
+    .titlebar button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: #a8a8a8;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label,
-      .button:backdrop:insensitive > .label,
-      .button.flat:backdrop:insensitive > .label,
-      .sidebar-button.button:backdrop:insensitive > .label,
-      .header-bar .titlebutton.button:backdrop:insensitive > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive > .label {
+      button:backdrop:insensitive > .label, .header-bar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar button.titlebutton:backdrop:insensitive > .label, button.flat:backdrop:insensitive > .label, .sidebar-button.button:backdrop:insensitive > .label, .header-bar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, button.flat:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked,
-    .button:backdrop:insensitive:active,
-    .button:backdrop:insensitive:checked,
-    .button.flat:backdrop:insensitive:active,
-    .sidebar-button.button:backdrop:insensitive:active,
-    .header-bar .titlebutton.button:backdrop:insensitive:active,
-    .titlebar .titlebutton.button:backdrop:insensitive:active,
-    .button.flat:backdrop:insensitive:checked,
-    .sidebar-button.button:backdrop:insensitive:checked,
-    .header-bar .titlebutton.button:backdrop:insensitive:checked,
-    .titlebar .titlebutton.button:backdrop:insensitive:checked {
+    button:backdrop:insensitive:active, button:backdrop:insensitive:checked, button.flat:backdrop:insensitive:active, .sidebar-button.button:backdrop:insensitive:active, .header-bar button.titlebutton:backdrop:insensitive:active,
+    .titlebar button.titlebutton:backdrop:insensitive:active, button.flat:backdrop:insensitive:checked, .sidebar-button.button:backdrop:insensitive:checked, .header-bar button.titlebutton:backdrop:insensitive:checked,
+    .titlebar button.titlebutton:backdrop:insensitive:checked {
       color: #c7c7c7;
-      border-color: #a8a8a8;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, #e7e7e7);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, button.flat:backdrop:insensitive:checked > .label,
-      .button:backdrop:insensitive:active > .label,
-      .button:backdrop:insensitive:checked > .label,
-      .button.flat:backdrop:insensitive:active > .label,
-      .sidebar-button.button:backdrop:insensitive:active > .label,
-      .header-bar .titlebutton.button:backdrop:insensitive:active > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive:active > .label,
-      .button.flat:backdrop:insensitive:checked > .label,
-      .sidebar-button.button:backdrop:insensitive:checked > .label,
-      .header-bar .titlebutton.button:backdrop:insensitive:checked > .label,
-      .titlebar .titlebutton.button:backdrop:insensitive:checked > .label {
+      button:backdrop:insensitive:active > .label, .header-bar button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button:backdrop:insensitive:checked > .label, .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:checked > .label, button.flat:backdrop:insensitive:active > .label, .sidebar-button.button:backdrop:insensitive:active > .label, .header-bar button.titlebutton:backdrop:insensitive:active > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:active > .label, button.flat:backdrop:insensitive:checked > .label, .sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+      .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
         color: inherit; }
-  button.flat:backdrop, button.flat:insensitive, button.flat:backdrop:insensitive,
-  .button.flat:backdrop,
-  .sidebar-button.button:backdrop,
-  .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop,
-  .button.flat:insensitive,
-  .sidebar-button.button:insensitive,
-  .header-bar .titlebutton.button:insensitive,
-  .titlebar .titlebutton.button:insensitive,
-  .button.flat:backdrop:insensitive,
-  .sidebar-button.button:backdrop:insensitive,
-  .header-bar .titlebutton.button:backdrop:insensitive,
-  .titlebar .titlebutton.button:backdrop:insensitive {
+  button.flat:backdrop, .sidebar-button.button:backdrop, .header-bar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop, button.flat:insensitive, .sidebar-button.button:insensitive, .header-bar button.titlebutton:insensitive,
+  .titlebar button.titlebutton:insensitive, button.flat:backdrop:insensitive, .sidebar-button.button:backdrop:insensitive, .header-bar button.titlebutton:backdrop:insensitive,
+  .titlebar button.titlebutton:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none; }
-  button:insensitive,
-  .button:insensitive,
-  .header-bar .button.titlebutton:insensitive,
-  .titlebar .button.titlebutton:insensitive {
-    color: #8d9091;
+  button:insensitive, .header-bar button.titlebutton:insensitive,
+  .titlebar button.titlebutton:insensitive {
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-    button:insensitive > .label,
-    .button:insensitive > .label {
+    button:insensitive > .label, .header-bar button.titlebutton:insensitive > .label,
+    .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
-    button:insensitive:active, button:insensitive:checked,
-    .button:insensitive:active,
-    .button:insensitive:checked {
-      color: #8d9091;
+    button:insensitive:active, button:insensitive:checked {
+      color: #8e9192;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button:insensitive:active > .label, button:insensitive:checked > .label,
-      .button:insensitive:active > .label,
-      .button:insensitive:checked > .label {
+      button:insensitive:active > .label, .header-bar button.titlebutton:insensitive:active > .label,
+      .titlebar button.titlebutton:insensitive:active > .label, button:insensitive:checked > .label, .header-bar button.titlebutton:insensitive:checked > .label,
+      .titlebar button.titlebutton:insensitive:checked > .label {
         color: inherit; }
-  button.osd,
-  .button.osd,
-  .header-bar .osd.button.titlebutton,
-  .titlebar .osd.button.titlebutton {
+  button.osd, .header-bar button.osd.titlebutton,
+  .titlebar button.osd.titlebutton {
     color: #eeeeec;
     border-radius: 5px;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -517,16 +451,10 @@ button,
     outline-color: rgba(238, 238, 236, 0.3);
     border: none;
     box-shadow: none; }
-    button.osd.image-button, .header-bar button.osd.titlebutton.button,
-    .titlebar button.osd.titlebutton.button,
-    .button.osd.image-button,
-    GtkScaleButton.button.osd,
-    GtkVolumeButton.button.osd,
-    .header-bar .osd.titlebutton.button,
-    .titlebar .osd.titlebutton.button {
+    button.osd.image-button, .header-bar button.osd.titlebutton,
+    .titlebar button.osd.titlebutton {
       padding: 13px; }
-    button.osd:hover,
-    .button.osd:hover {
+    button.osd:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -537,9 +465,7 @@ button,
       outline-color: rgba(238, 238, 236, 0.3);
       border: none;
       box-shadow: none; }
-    button.osd:active, button.osd:checked,
-    .button.osd:active,
-    .button.osd:checked {
+    button.osd:active, button.osd:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -550,19 +476,16 @@ button,
       outline-color: rgba(238, 238, 236, 0.3);
       border: none;
       box-shadow: none; }
-    button.osd:insensitive, button.osd:backdrop:insensitive,
-    .button.osd:insensitive,
-    .button.osd:backdrop:insensitive {
-      color: #878989;
+    button.osd:insensitive, button.osd:backdrop:insensitive {
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
       border: none; }
-    button.osd:backdrop,
-    .button.osd:backdrop {
+    button.osd:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -571,10 +494,9 @@ button,
       text-shadow: none;
       icon-shadow: none;
       border: none; }
-  .osd button, .osd
-  .button, .osd .header-bar .button.titlebutton, .header-bar .osd .button.titlebutton,
-  .osd .titlebar .button.titlebutton,
-  .titlebar .osd .button.titlebutton {
+  .osd button, .osd .header-bar button.titlebutton, .header-bar .osd button.titlebutton,
+  .osd .titlebar button.titlebutton,
+  .titlebar .osd button.titlebutton {
     color: #eeeeec;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -583,8 +505,7 @@ button,
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button:hover, .osd
-    .button:hover {
+    .osd button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -593,11 +514,7 @@ button,
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button:active, .osd button:checked, .osd button:backdrop:active, .osd button:backdrop:checked, .osd
-    .button:active, .osd
-    .button:checked, .osd
-    .button:backdrop:active, .osd
-    .button:backdrop:checked {
+    .osd button:active, .osd button:checked, .osd button:backdrop:active, .osd button:backdrop:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -606,18 +523,15 @@ button,
       text-shadow: none;
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .osd button:insensitive, .osd button:backdrop:insensitive, .osd
-    .button:insensitive, .osd
-    .button:backdrop:insensitive {
-      color: #878989;
+    .osd button:insensitive, .osd button:backdrop:insensitive {
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd button:backdrop, .osd
-    .button:backdrop {
+    .osd button:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -625,11 +539,9 @@ button,
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .osd button.flat, .osd
-    .button.flat, .osd
-    .sidebar-button.button, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
-    .osd .titlebar .titlebutton.button,
-    .titlebar .osd .titlebutton.button {
+    .osd button.flat, .osd .sidebar-button.button, .osd .header-bar button.titlebutton, .header-bar .osd button.titlebutton,
+    .osd .titlebar button.titlebutton,
+    .titlebar .osd button.titlebutton {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -639,11 +551,9 @@ button,
       box-shadow: none;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
-      .osd button.flat:hover, .osd
-      .button.flat:hover, .osd
-      .sidebar-button.button:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd .titlebutton.button:hover,
-      .osd .titlebar .titlebutton.button:hover,
-      .titlebar .osd .titlebutton.button:hover {
+      .osd button.flat:hover, .osd .sidebar-button.button:hover, .osd .header-bar button.titlebutton:hover, .header-bar .osd button.titlebutton:hover,
+      .osd .titlebar button.titlebutton:hover,
+      .titlebar .osd button.titlebutton:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -655,14 +565,12 @@ button,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:insensitive, .osd
-      .button.flat:insensitive, .osd
-      .sidebar-button.button:insensitive, .osd .header-bar .titlebutton.button:insensitive, .header-bar .osd .titlebutton.button:insensitive,
-      .osd .titlebar .titlebutton.button:insensitive,
-      .titlebar .osd .titlebutton.button:insensitive {
-        color: #878989;
+      .osd button.flat:insensitive, .osd .sidebar-button.button:insensitive, .osd .header-bar button.titlebutton:insensitive, .header-bar .osd button.titlebutton:insensitive,
+      .osd .titlebar button.titlebutton:insensitive,
+      .titlebar .osd button.titlebutton:insensitive {
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -670,26 +578,20 @@ button,
         background-image: none;
         border-color: transparent;
         box-shadow: none; }
-      .osd button.flat:backdrop, .osd
-      .button.flat:backdrop, .osd
-      .sidebar-button.button:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd .titlebutton.button:backdrop,
-      .osd .titlebar .titlebutton.button:backdrop,
-      .titlebar .osd .titlebutton.button:backdrop {
+      .osd button.flat:backdrop, .osd .sidebar-button.button:backdrop, .osd .header-bar button.titlebutton:backdrop, .header-bar .osd button.titlebutton:backdrop,
+      .osd .titlebar button.titlebutton:backdrop,
+      .titlebar .osd button.titlebutton:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.flat:active, .osd button.flat:checked, .osd
-      .button.flat:active, .osd
-      .sidebar-button.button:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd .titlebutton.button:active,
-      .osd .titlebar .titlebutton.button:active,
-      .titlebar .osd .titlebutton.button:active, .osd
-      .button.flat:checked, .osd
-      .sidebar-button.button:checked, .osd .header-bar .titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
-      .osd .titlebar .titlebutton.button:checked,
-      .titlebar .osd .titlebutton.button:checked {
+      .osd button.flat:active, .osd .sidebar-button.button:active, .osd .header-bar button.titlebutton:active, .header-bar .osd button.titlebutton:active,
+      .osd .titlebar button.titlebutton:active,
+      .titlebar .osd button.titlebutton:active, .osd button.flat:checked, .osd .sidebar-button.button:checked, .osd .header-bar button.titlebutton:checked, .header-bar .osd button.titlebutton:checked,
+      .osd .titlebar button.titlebutton:checked,
+      .titlebar .osd button.titlebutton:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -701,10 +603,8 @@ button,
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
-  button.suggested-action,
-  .button.suggested-action,
-  .header-bar .suggested-action.button.titlebutton,
-  .titlebar .suggested-action.button.titlebutton {
+  button.suggested-action, .header-bar button.suggested-action.titlebutton,
+  .titlebar button.suggested-action.titlebutton {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #1c5187;
@@ -712,11 +612,8 @@ button,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px white; }
-    button.suggested-action.flat,
-    .button.suggested-action.flat,
-    .suggested-action.sidebar-button.button,
-    .header-bar .suggested-action.titlebutton.button,
-    .titlebar .suggested-action.titlebutton.button {
+    button.suggested-action.flat, .suggested-action.sidebar-button.button, .header-bar button.suggested-action.titlebutton,
+    .titlebar button.suggested-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -724,8 +621,7 @@ button,
       text-shadow: none;
       icon-shadow: none;
       color: #4a90d9; }
-    button.suggested-action:hover,
-    .button.suggested-action:hover {
+    button.suggested-action:hover {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #1c5187;
@@ -733,9 +629,7 @@ button,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px white; }
-    button.suggested-action:active, button.suggested-action:checked,
-    .button.suggested-action:active,
-    .button.suggested-action:checked {
+    button.suggested-action:active, button.suggested-action:checked {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #1c5187;
@@ -743,92 +637,50 @@ button,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
-    button.suggested-action:backdrop, button.suggested-action.flat:backdrop,
-    .button.suggested-action:backdrop,
-    .button.suggested-action.flat:backdrop,
-    .suggested-action.sidebar-button.button:backdrop,
-    .header-bar .suggested-action.titlebutton.button:backdrop,
-    .titlebar .suggested-action.titlebutton.button:backdrop {
-      color: #dae8f7;
+    button.suggested-action:backdrop, button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar button.suggested-action.titlebutton:backdrop,
+    .titlebar button.suggested-action.titlebutton:backdrop {
+      color: #dbe9f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.flat:backdrop:checked,
-      .button.suggested-action:backdrop:active,
-      .button.suggested-action:backdrop:checked,
-      .button.suggested-action.flat:backdrop:active,
-      .suggested-action.sidebar-button.button:backdrop:active,
-      .header-bar .suggested-action.titlebutton.button:backdrop:active,
-      .titlebar .suggested-action.titlebutton.button:backdrop:active,
-      .button.suggested-action.flat:backdrop:checked,
-      .suggested-action.sidebar-button.button:backdrop:checked,
-      .header-bar .suggested-action.titlebutton.button:backdrop:checked,
-      .titlebar .suggested-action.titlebutton.button:backdrop:checked {
-        color: #d4e3f3;
+      button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, .suggested-action.sidebar-button.button:backdrop:active, .header-bar button.suggested-action.titlebutton:backdrop:active,
+      .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, .suggested-action.sidebar-button.button:backdrop:checked, .header-bar button.suggested-action.titlebutton:backdrop:checked,
+      .titlebar button.suggested-action.titlebutton:backdrop:checked {
+        color: #d4e4f4;
         border-color: #2a76c6;
         background-image: linear-gradient(to bottom, #2a76c6);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive,
-      .button.suggested-action:backdrop:insensitive,
-      .button.suggested-action.flat:backdrop:insensitive,
-      .suggested-action.sidebar-button.button:backdrop:insensitive,
-      .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
-      .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
+      button.suggested-action:backdrop:insensitive, button.suggested-action.flat:backdrop:insensitive, .suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar button.suggested-action.titlebutton:backdrop:insensitive,
+      .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.suggested-action:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label,
-        .button.suggested-action:backdrop:insensitive > .label,
-        .button.suggested-action.flat:backdrop:insensitive > .label,
-        .suggested-action.sidebar-button.button:backdrop:insensitive > .label,
-        .header-bar .suggested-action.titlebutton.button:backdrop:insensitive > .label,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive > .label {
+        button.suggested-action:backdrop:insensitive > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label, button.suggested-action.flat:backdrop:insensitive > .label, .suggested-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.suggested-action:backdrop:insensitive:active, button.suggested-action:backdrop:insensitive:checked, button.suggested-action.flat:backdrop:insensitive:active, button.suggested-action.flat:backdrop:insensitive:checked,
-        .button.suggested-action:backdrop:insensitive:active,
-        .button.suggested-action:backdrop:insensitive:checked,
-        .button.suggested-action.flat:backdrop:insensitive:active,
-        .suggested-action.sidebar-button.button:backdrop:insensitive:active,
-        .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active,
-        .button.suggested-action.flat:backdrop:insensitive:checked,
-        .suggested-action.sidebar-button.button:backdrop:insensitive:checked,
-        .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked,
-        .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #8db8e6;
-          border-color: #5093da;
-          background-image: linear-gradient(to bottom, #5093da);
+        button.suggested-action:backdrop:insensitive:active, button.suggested-action:backdrop:insensitive:checked, button.suggested-action.flat:backdrop:insensitive:active, .suggested-action.sidebar-button.button:backdrop:insensitive:active, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active, button.suggested-action.flat:backdrop:insensitive:checked, .suggested-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:checked,
+        .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked {
+          color: #8db9e8;
+          border-color: #5094db;
+          background-image: linear-gradient(to bottom, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-          button.suggested-action:backdrop:insensitive:active > .label, button.suggested-action:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, button.suggested-action.flat:backdrop:insensitive:checked > .label,
-          .button.suggested-action:backdrop:insensitive:active > .label,
-          .button.suggested-action:backdrop:insensitive:checked > .label,
-          .button.suggested-action.flat:backdrop:insensitive:active > .label,
-          .suggested-action.sidebar-button.button:backdrop:insensitive:active > .label,
-          .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label,
-          .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:active > .label,
-          .button.suggested-action.flat:backdrop:insensitive:checked > .label,
-          .suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label,
-          .titlebar .suggested-action.titlebutton.button:backdrop:insensitive:checked > .label {
+          button.suggested-action:backdrop:insensitive:active > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action:backdrop:insensitive:checked > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label, button.suggested-action.flat:backdrop:insensitive:active > .label, .suggested-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:active > .label, button.suggested-action.flat:backdrop:insensitive:checked > .label, .suggested-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.suggested-action.flat:backdrop, button.suggested-action.flat:insensitive, button.suggested-action.flat:backdrop:insensitive,
-    .button.suggested-action.flat:backdrop,
-    .suggested-action.sidebar-button.button:backdrop,
-    .header-bar .suggested-action.titlebutton.button:backdrop,
-    .titlebar .suggested-action.titlebutton.button:backdrop,
-    .button.suggested-action.flat:insensitive,
-    .suggested-action.sidebar-button.button:insensitive,
-    .header-bar .suggested-action.titlebutton.button:insensitive,
-    .titlebar .suggested-action.titlebutton.button:insensitive,
-    .button.suggested-action.flat:backdrop:insensitive,
-    .suggested-action.sidebar-button.button:backdrop:insensitive,
-    .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
-    .titlebar .suggested-action.titlebutton.button:backdrop:insensitive {
+    button.suggested-action.flat:backdrop, .suggested-action.sidebar-button.button:backdrop, .header-bar button.suggested-action.titlebutton:backdrop,
+    .titlebar button.suggested-action.titlebutton:backdrop, button.suggested-action.flat:insensitive, .suggested-action.sidebar-button.button:insensitive, .header-bar button.suggested-action.titlebutton:insensitive,
+    .titlebar button.suggested-action.titlebutton:insensitive, button.suggested-action.flat:backdrop:insensitive, .suggested-action.sidebar-button.button:backdrop:insensitive, .header-bar button.suggested-action.titlebutton:backdrop:insensitive,
+    .titlebar button.suggested-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -836,30 +688,26 @@ button,
       text-shadow: none;
       icon-shadow: none;
       color: rgba(74, 144, 217, 0.8); }
-    button.suggested-action:insensitive,
-    .button.suggested-action:insensitive {
-      color: #8d9091;
+    button.suggested-action:insensitive {
+      color: #8e9192;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button.suggested-action:insensitive > .label,
-      .button.suggested-action:insensitive > .label {
+      button.suggested-action:insensitive > .label, .header-bar button.suggested-action.titlebutton:insensitive > .label,
+      .titlebar button.suggested-action.titlebutton:insensitive > .label {
         color: inherit; }
-      button.suggested-action:insensitive:active, button.suggested-action:insensitive:checked,
-      .button.suggested-action:insensitive:active,
-      .button.suggested-action:insensitive:checked {
-        color: #b9d3f0;
+      button.suggested-action:insensitive:active, button.suggested-action:insensitive:checked {
+        color: #b9d4f1;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
+        background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-        button.suggested-action:insensitive:active > .label, button.suggested-action:insensitive:checked > .label,
-        .button.suggested-action:insensitive:active > .label,
-        .button.suggested-action:insensitive:checked > .label {
+        button.suggested-action:insensitive:active > .label, .header-bar button.suggested-action.titlebutton:insensitive:active > .label,
+        .titlebar button.suggested-action.titlebutton:insensitive:active > .label, button.suggested-action:insensitive:checked > .label, .header-bar button.suggested-action.titlebutton:insensitive:checked > .label,
+        .titlebar button.suggested-action.titlebutton:insensitive:checked > .label {
           color: inherit; }
-    .osd button.suggested-action, .osd
-    .button.suggested-action {
+    .osd button.suggested-action {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5));
@@ -868,8 +716,7 @@ button,
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.suggested-action:hover, .osd
-      .button.suggested-action:hover {
+      .osd button.suggested-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.7));
@@ -878,11 +725,7 @@ button,
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.suggested-action:active, .osd button.suggested-action:checked, .osd button.suggested-action:backdrop:active, .osd button.suggested-action:backdrop:checked, .osd
-      .button.suggested-action:active, .osd
-      .button.suggested-action:checked, .osd
-      .button.suggested-action:backdrop:active, .osd
-      .button.suggested-action:backdrop:checked {
+      .osd button.suggested-action:active, .osd button.suggested-action:checked, .osd button.suggested-action:backdrop:active, .osd button.suggested-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #4a90d9);
@@ -891,18 +734,15 @@ button,
         text-shadow: none;
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.suggested-action:insensitive, .osd button.suggested-action:backdrop:insensitive, .osd
-      .button.suggested-action:insensitive, .osd
-      .button.suggested-action:backdrop:insensitive {
-        color: #878989;
+      .osd button.suggested-action:insensitive, .osd button.suggested-action:backdrop:insensitive {
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.suggested-action:backdrop, .osd
-      .button.suggested-action:backdrop {
+      .osd button.suggested-action:backdrop {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5));
@@ -910,10 +750,8 @@ button,
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  button.destructive-action,
-  .button.destructive-action,
-  .header-bar .destructive-action.button.titlebutton,
-  .titlebar .destructive-action.button.titlebutton {
+  button.destructive-action, .header-bar button.destructive-action.titlebutton,
+  .titlebar button.destructive-action.titlebutton {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #8e0b0b;
@@ -921,11 +759,8 @@ button,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px white; }
-    button.destructive-action.flat,
-    .button.destructive-action.flat,
-    .destructive-action.sidebar-button.button,
-    .header-bar .destructive-action.titlebutton.button,
-    .titlebar .destructive-action.titlebutton.button {
+    button.destructive-action.flat, .destructive-action.sidebar-button.button, .header-bar button.destructive-action.titlebutton,
+    .titlebar button.destructive-action.titlebutton {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -933,8 +768,7 @@ button,
       text-shadow: none;
       icon-shadow: none;
       color: #ef2929; }
-    button.destructive-action:hover,
-    .button.destructive-action:hover {
+    button.destructive-action:hover {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #8e0b0b;
@@ -942,9 +776,7 @@ button,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px white; }
-    button.destructive-action:active, button.destructive-action:checked,
-    .button.destructive-action:active,
-    .button.destructive-action:checked {
+    button.destructive-action:active, button.destructive-action:checked {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #8e0b0b;
@@ -952,92 +784,50 @@ button,
       text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
-    button.destructive-action:backdrop, button.destructive-action.flat:backdrop,
-    .button.destructive-action:backdrop,
-    .button.destructive-action.flat:backdrop,
-    .destructive-action.sidebar-button.button:backdrop,
-    .header-bar .destructive-action.titlebutton.button:backdrop,
-    .titlebar .destructive-action.titlebutton.button:backdrop {
-      color: #fbd4d4;
+    button.destructive-action:backdrop, button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar button.destructive-action.titlebutton:backdrop,
+    .titlebar button.destructive-action.titlebutton:backdrop {
+      color: #fcd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, button.destructive-action.flat:backdrop:checked,
-      .button.destructive-action:backdrop:active,
-      .button.destructive-action:backdrop:checked,
-      .button.destructive-action.flat:backdrop:active,
-      .destructive-action.sidebar-button.button:backdrop:active,
-      .header-bar .destructive-action.titlebutton.button:backdrop:active,
-      .titlebar .destructive-action.titlebutton.button:backdrop:active,
-      .button.destructive-action.flat:backdrop:checked,
-      .destructive-action.sidebar-button.button:backdrop:checked,
-      .header-bar .destructive-action.titlebutton.button:backdrop:checked,
-      .titlebar .destructive-action.titlebutton.button:backdrop:checked {
-        color: #f6cfcf;
+      button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, .destructive-action.sidebar-button.button:backdrop:active, .header-bar button.destructive-action.titlebutton:backdrop:active,
+      .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, .destructive-action.sidebar-button.button:backdrop:checked, .header-bar button.destructive-action.titlebutton:backdrop:checked,
+      .titlebar button.destructive-action.titlebutton:backdrop:checked {
+        color: #f7cfcf;
         border-color: #d51010;
         background-image: linear-gradient(to bottom, #d51010);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive,
-      .button.destructive-action:backdrop:insensitive,
-      .button.destructive-action.flat:backdrop:insensitive,
-      .destructive-action.sidebar-button.button:backdrop:insensitive,
-      .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
-      .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
+      button.destructive-action:backdrop:insensitive, button.destructive-action.flat:backdrop:insensitive, .destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar button.destructive-action.titlebutton:backdrop:insensitive,
+      .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.destructive-action:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label,
-        .button.destructive-action:backdrop:insensitive > .label,
-        .button.destructive-action.flat:backdrop:insensitive > .label,
-        .destructive-action.sidebar-button.button:backdrop:insensitive > .label,
-        .header-bar .destructive-action.titlebutton.button:backdrop:insensitive > .label,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive > .label {
+        button.destructive-action:backdrop:insensitive > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label, button.destructive-action.flat:backdrop:insensitive > .label, .destructive-action.sidebar-button.button:backdrop:insensitive > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-        button.destructive-action:backdrop:insensitive:active, button.destructive-action:backdrop:insensitive:checked, button.destructive-action.flat:backdrop:insensitive:active, button.destructive-action.flat:backdrop:insensitive:checked,
-        .button.destructive-action:backdrop:insensitive:active,
-        .button.destructive-action:backdrop:insensitive:checked,
-        .button.destructive-action.flat:backdrop:insensitive:active,
-        .destructive-action.sidebar-button.button:backdrop:insensitive:active,
-        .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active,
-        .button.destructive-action.flat:backdrop:insensitive:checked,
-        .destructive-action.sidebar-button.button:backdrop:insensitive:checked,
-        .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked,
-        .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked {
-          color: #f47979;
+        button.destructive-action:backdrop:insensitive:active, button.destructive-action:backdrop:insensitive:checked, button.destructive-action.flat:backdrop:insensitive:active, .destructive-action.sidebar-button.button:backdrop:insensitive:active, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:active,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active, button.destructive-action.flat:backdrop:insensitive:checked, .destructive-action.sidebar-button.button:backdrop:insensitive:checked, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:checked,
+        .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked {
+          color: #f57979;
           border-color: #ef3131;
           background-image: linear-gradient(to bottom, #ef3131);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-          button.destructive-action:backdrop:insensitive:active > .label, button.destructive-action:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, button.destructive-action.flat:backdrop:insensitive:checked > .label,
-          .button.destructive-action:backdrop:insensitive:active > .label,
-          .button.destructive-action:backdrop:insensitive:checked > .label,
-          .button.destructive-action.flat:backdrop:insensitive:active > .label,
-          .destructive-action.sidebar-button.button:backdrop:insensitive:active > .label,
-          .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label,
-          .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:active > .label,
-          .button.destructive-action.flat:backdrop:insensitive:checked > .label,
-          .destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label,
-          .titlebar .destructive-action.titlebutton.button:backdrop:insensitive:checked > .label {
+          button.destructive-action:backdrop:insensitive:active > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action:backdrop:insensitive:checked > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label, button.destructive-action.flat:backdrop:insensitive:active > .label, .destructive-action.sidebar-button.button:backdrop:insensitive:active > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:active > .label, button.destructive-action.flat:backdrop:insensitive:checked > .label, .destructive-action.sidebar-button.button:backdrop:insensitive:checked > .label, .header-bar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-    button.destructive-action.flat:backdrop, button.destructive-action.flat:insensitive, button.destructive-action.flat:backdrop:insensitive,
-    .button.destructive-action.flat:backdrop,
-    .destructive-action.sidebar-button.button:backdrop,
-    .header-bar .destructive-action.titlebutton.button:backdrop,
-    .titlebar .destructive-action.titlebutton.button:backdrop,
-    .button.destructive-action.flat:insensitive,
-    .destructive-action.sidebar-button.button:insensitive,
-    .header-bar .destructive-action.titlebutton.button:insensitive,
-    .titlebar .destructive-action.titlebutton.button:insensitive,
-    .button.destructive-action.flat:backdrop:insensitive,
-    .destructive-action.sidebar-button.button:backdrop:insensitive,
-    .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
-    .titlebar .destructive-action.titlebutton.button:backdrop:insensitive {
+    button.destructive-action.flat:backdrop, .destructive-action.sidebar-button.button:backdrop, .header-bar button.destructive-action.titlebutton:backdrop,
+    .titlebar button.destructive-action.titlebutton:backdrop, button.destructive-action.flat:insensitive, .destructive-action.sidebar-button.button:insensitive, .header-bar button.destructive-action.titlebutton:insensitive,
+    .titlebar button.destructive-action.titlebutton:insensitive, button.destructive-action.flat:backdrop:insensitive, .destructive-action.sidebar-button.button:backdrop:insensitive, .header-bar button.destructive-action.titlebutton:backdrop:insensitive,
+    .titlebar button.destructive-action.titlebutton:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -1045,30 +835,26 @@ button,
       text-shadow: none;
       icon-shadow: none;
       color: rgba(239, 41, 41, 0.8); }
-    button.destructive-action:insensitive,
-    .button.destructive-action:insensitive {
-      color: #8d9091;
+    button.destructive-action:insensitive {
+      color: #8e9192;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-      button.destructive-action:insensitive > .label,
-      .button.destructive-action:insensitive > .label {
+      button.destructive-action:insensitive > .label, .header-bar button.destructive-action.titlebutton:insensitive > .label,
+      .titlebar button.destructive-action.titlebutton:insensitive > .label {
         color: inherit; }
-      button.destructive-action:insensitive:active, button.destructive-action:insensitive:checked,
-      .button.destructive-action:insensitive:active,
-      .button.destructive-action:insensitive:checked {
-        color: #f8acac;
+      button.destructive-action:insensitive:active, button.destructive-action:insensitive:checked {
+        color: #f9adad;
         border-color: #8e0b0b;
         background-image: linear-gradient(to bottom, #e52d2d, #ef3131);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-        button.destructive-action:insensitive:active > .label, button.destructive-action:insensitive:checked > .label,
-        .button.destructive-action:insensitive:active > .label,
-        .button.destructive-action:insensitive:checked > .label {
+        button.destructive-action:insensitive:active > .label, .header-bar button.destructive-action.titlebutton:insensitive:active > .label,
+        .titlebar button.destructive-action.titlebutton:insensitive:active > .label, button.destructive-action:insensitive:checked > .label, .header-bar button.destructive-action.titlebutton:insensitive:checked > .label,
+        .titlebar button.destructive-action.titlebutton:insensitive:checked > .label {
           color: inherit; }
-    .osd button.destructive-action, .osd
-    .button.destructive-action {
+    .osd button.destructive-action {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5));
@@ -1077,8 +863,7 @@ button,
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.destructive-action:hover, .osd
-      .button.destructive-action:hover {
+      .osd button.destructive-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.7));
@@ -1087,11 +872,7 @@ button,
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.destructive-action:active, .osd button.destructive-action:checked, .osd button.destructive-action:backdrop:active, .osd button.destructive-action:backdrop:checked, .osd
-      .button.destructive-action:active, .osd
-      .button.destructive-action:checked, .osd
-      .button.destructive-action:backdrop:active, .osd
-      .button.destructive-action:backdrop:checked {
+      .osd button.destructive-action:active, .osd button.destructive-action:checked, .osd button.destructive-action:backdrop:active, .osd button.destructive-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #ef2929);
@@ -1100,18 +881,15 @@ button,
         text-shadow: none;
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd button.destructive-action:insensitive, .osd button.destructive-action:backdrop:insensitive, .osd
-      .button.destructive-action:insensitive, .osd
-      .button.destructive-action:backdrop:insensitive {
-        color: #878989;
+      .osd button.destructive-action:insensitive, .osd button.destructive-action:backdrop:insensitive {
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-      .osd button.destructive-action:backdrop, .osd
-      .button.destructive-action:backdrop {
+      .osd button.destructive-action:backdrop {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5));
@@ -1119,112 +897,76 @@ button,
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  button.image-button, .header-bar button.titlebutton.button,
-  .titlebar button.titlebutton.button,
-  .button.image-button,
-  GtkScaleButton.button,
-  GtkVolumeButton.button,
-  .header-bar .titlebutton.button,
-  .titlebar .titlebutton.button {
+  button.image-button, .header-bar button.titlebutton,
+  .titlebar button.titlebutton {
     padding: 8px; }
-  button.text-button,
-  .button.text-button,
-  GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button,
-  .header-bar .text-button.button.titlebutton,
-  .titlebar .text-button.button.titlebutton {
+  button.text-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar button.text-button.titlebutton,
+  .titlebar button.text-button.titlebutton {
     padding-left: 16px;
     padding-right: 16px; }
-  button.text-button.image-button, .header-bar button.text-button.titlebutton.button,
-  .titlebar button.text-button.titlebutton.button,
-  .button.text-button.image-button,
-  GtkScaleButton.button.text-button,
-  GtkVolumeButton.button.text-button,
-  .header-bar .text-button.titlebutton.button,
-  .titlebar .text-button.titlebutton.button {
+  button.text-button.image-button, GtkScaleButton.button.text-button,
+  GtkVolumeButton.button.text-button, .header-bar button.text-button.titlebutton,
+  .titlebar button.text-button.titlebutton {
     padding: 5px 8px 6px; }
-    button.text-button.image-button label:first-child, .header-bar button.text-button.titlebutton.button label:first-child,
-    .titlebar button.text-button.titlebutton.button label:first-child,
-    .button.text-button.image-button label:first-child,
-    GtkScaleButton.button.text-button label:first-child,
-    GtkVolumeButton.button.text-button label:first-child,
-    .header-bar .text-button.titlebutton.button label:first-child,
-    .titlebar .text-button.titlebutton.button label:first-child {
+    button.text-button.image-button label:first-child, GtkScaleButton.button.text-button label:first-child,
+    GtkVolumeButton.button.text-button label:first-child, .header-bar button.text-button.titlebutton label:first-child,
+    .titlebar button.text-button.titlebutton label:first-child {
       padding-left: 8px; }
-    button.text-button.image-button label:last-child, .header-bar button.text-button.titlebutton.button label:last-child,
-    .titlebar button.text-button.titlebutton.button label:last-child,
-    .button.text-button.image-button label:last-child,
-    GtkScaleButton.button.text-button label:last-child,
-    GtkVolumeButton.button.text-button label:last-child,
-    .header-bar .text-button.titlebutton.button label:last-child,
-    .titlebar .text-button.titlebutton.button label:last-child {
+    button.text-button.image-button label:last-child, GtkScaleButton.button.text-button label:last-child,
+    GtkVolumeButton.button.text-button label:last-child, .header-bar button.text-button.titlebutton label:last-child,
+    .titlebar button.text-button.titlebutton label:last-child {
       padding-right: 8px; }
-  .stack-switcher > button, .stack-switcher >
-  .button, .header-bar .stack-switcher > .button.titlebutton,
-  .titlebar .stack-switcher > .button.titlebutton {
+  .stack-switcher > button, .header-bar .stack-switcher > button.titlebutton,
+  .titlebar .stack-switcher > button.titlebutton {
     outline-offset: -3px; }
-    .stack-switcher > button > label, .stack-switcher >
-    .button > label, .header-bar .stack-switcher > .button.titlebutton > label,
-    .titlebar .stack-switcher > .button.titlebutton > label {
+    .stack-switcher > button > label, .header-bar .stack-switcher > button.titlebutton > label,
+    .titlebar .stack-switcher > button.titlebutton > label {
       padding-left: 6px;
       padding-right: 6px; }
-    .stack-switcher > button > image, .stack-switcher >
-    .button > image, .header-bar .stack-switcher > .button.titlebutton > image,
-    .titlebar .stack-switcher > .button.titlebutton > image {
+    .stack-switcher > button > image, .header-bar .stack-switcher > button.titlebutton > image,
+    .titlebar .stack-switcher > button.titlebutton > image {
       padding-left: 6px;
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
-    .stack-switcher > button.text-button, .stack-switcher >
-    .button.text-button {
+    .stack-switcher > button.text-button, .stack-switcher > GtkScaleButton.button.text-button,
+    .stack-switcher > GtkVolumeButton.button.text-button, .header-bar .stack-switcher > button.text-button.titlebutton, .header-bar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
+    .header-bar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button,
+    .titlebar .stack-switcher > button.text-button.titlebutton,
+    .titlebar .stack-switcher > GtkScaleButton.titlebutton.button.text-button,
+    .titlebar .stack-switcher > GtkVolumeButton.titlebutton.button.text-button {
       padding: 5px 10px 6px; }
-    .stack-switcher > button.image-button, .header-bar .stack-switcher > button.titlebutton.button,
-    .titlebar .stack-switcher > button.titlebutton.button, .stack-switcher >
-    .button.image-button, .stack-switcher >
-    GtkScaleButton.button,
-    .stack-switcher > GtkVolumeButton.button, .header-bar .stack-switcher > .titlebutton.button,
-    .titlebar .stack-switcher > .titlebutton.button {
+    .stack-switcher > button.image-button, .header-bar .stack-switcher > button.titlebutton,
+    .titlebar .stack-switcher > button.titlebutton {
       padding: 5px 2px; }
-    .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image, .stack-switcher >
-    .button.needs-attention:active > label, .stack-switcher >
-    .button.needs-attention:active > image, .stack-switcher >
-    .button.needs-attention:checked > label, .stack-switcher >
-    .button.needs-attention:checked > image {
+    .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image {
       animation: none;
       background-image: none; }
-  .inline-toolbar button, .inline-toolbar button:backdrop, .inline-toolbar
-  .button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
-  .inline-toolbar .titlebar .button.titlebutton,
-  .titlebar .inline-toolbar .button.titlebutton, .inline-toolbar
-  .button:backdrop {
+  .inline-toolbar button, .inline-toolbar .header-bar button.titlebutton, .header-bar .inline-toolbar button.titlebutton,
+  .inline-toolbar .titlebar button.titlebutton,
+  .titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop {
     border-radius: 2px;
     border-width: 1px; }
-  .primary-toolbar button, .primary-toolbar
-  .button, .primary-toolbar .header-bar .button.titlebutton, .header-bar .primary-toolbar .button.titlebutton,
-  .primary-toolbar .titlebar .button.titlebutton,
-  .titlebar .primary-toolbar .button.titlebutton {
+  .primary-toolbar button, .primary-toolbar .header-bar button.titlebutton, .header-bar .primary-toolbar button.titlebutton,
+  .primary-toolbar .titlebar button.titlebutton,
+  .titlebar .primary-toolbar button.titlebutton {
     icon-shadow: none; }
 
-.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, .stack-switcher >
-.button.needs-attention > label, .stack-switcher >
-.button.needs-attention > image, .sidebar-item.needs-attention > label {
+.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, .sidebar-item.needs-attention > label {
   animation: needs_attention 150ms ease-in;
   background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#4a90d9), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.76923)), to(transparent));
   background-size: 6px 6px, 6px 6px;
   background-repeat: no-repeat;
   background-position: right 3px, right 4px; }
-  .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, .stack-switcher >
-  .button.needs-attention > label:backdrop, .stack-switcher >
-  .button.needs-attention > image:backdrop, .sidebar-item.needs-attention > label:backdrop {
+  .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, .sidebar-item.needs-attention > label:backdrop {
     background-size: 6px 6px, 0 0; }
-  .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), .stack-switcher >
-  .button.needs-attention > label:dir(rtl), .stack-switcher >
-  .button.needs-attention > image:dir(rtl), .sidebar-item.needs-attention > label:dir(rtl) {
+  .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), .sidebar-item.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 4px; }
 
-.inline-toolbar GtkToolButton > .button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton > .button.titlebutton {
+.inline-toolbar GtkToolButton > button, .inline-toolbar .header-bar GtkToolButton > button.titlebutton, .header-bar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton > button.titlebutton {
   color: #2e3436;
   outline-color: rgba(46, 52, 54, 0.3);
   border-color: #a1a1a1;
@@ -1232,7 +974,8 @@ button,
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white, 0 1px white; }
-  .inline-toolbar GtkToolButton > .button:hover {
+  .inline-toolbar GtkToolButton > button:hover, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:hover,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -1240,7 +983,9 @@ button,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px white; }
-  .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked {
+  .inline-toolbar GtkToolButton > button:active, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:active, .inline-toolbar GtkToolButton > button:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:checked,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:checked {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -1248,199 +993,192 @@ button,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
-  .inline-toolbar GtkToolButton > .button:insensitive {
-    color: #8d9091;
+  .inline-toolbar GtkToolButton > button:insensitive, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:insensitive,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive {
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-    .inline-toolbar GtkToolButton > .button:insensitive > .label {
+    .inline-toolbar GtkToolButton > button:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked {
-    color: #8d9091;
+  .inline-toolbar GtkToolButton > button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:active, .inline-toolbar GtkToolButton > button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:insensitive:checked,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:insensitive:checked {
+    color: #8e9192;
     border-color: #a1a1a1;
-    background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
+    background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-    .inline-toolbar GtkToolButton > .button:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:insensitive:checked > .label {
+    .inline-toolbar GtkToolButton > button:insensitive:active > .label, .inline-toolbar GtkToolButton > button:insensitive:checked > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
+  .inline-toolbar GtkToolButton > button:backdrop, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop {
+    color: #8e9192;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked {
-    color: #8d9091;
-    border-color: #a8a8a8;
-    background-image: linear-gradient(to bottom, #d4d4d4);
+  .inline-toolbar GtkToolButton > button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:active, .inline-toolbar GtkToolButton > button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:checked,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:checked {
+    color: #8e9192;
+    border-color: darkgray;
+    background-image: linear-gradient(to bottom, #d5d5d5);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
+  .inline-toolbar GtkToolButton > button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:insensitive,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    .inline-toolbar GtkToolButton > .button:backdrop:insensitive > .label {
+    .inline-toolbar GtkToolButton > button:backdrop:insensitive > .label {
       color: inherit; }
-  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked {
+  .inline-toolbar GtkToolButton > button:backdrop:insensitive:active, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:insensitive:active,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:active, .inline-toolbar GtkToolButton > button:backdrop:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > button.titlebutton:backdrop:insensitive:checked,
+  .inline-toolbar .titlebar GtkToolButton > button.titlebutton:backdrop:insensitive:checked {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #e7e7e7);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > .label, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > .label {
+    .inline-toolbar GtkToolButton > button:backdrop:insensitive:active > .label, .inline-toolbar GtkToolButton > button:backdrop:insensitive:checked > .label {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
-.inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat,
-.inline-toolbar GtkToolButton:backdrop > .button.flat,
-.inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat,
-.inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat,
+.inline-toolbar.toolbar GtkToolButton > button.flat, .inline-toolbar GtkToolButton > button.flat, .inline-toolbar.search-bar GtkToolButton > button.flat, .inline-toolbar.location-bar GtkToolButton > button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton > button.titlebutton, .header-bar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton:backdrop > button.flat,
+.inline-toolbar GtkToolButton:backdrop > button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop > button.flat,
+.inline-toolbar.location-bar GtkToolButton:backdrop > button.flat,
 .inline-toolbar.toolbar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop > .button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:backdrop > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton, .inline-toolbar button, .inline-toolbar button:backdrop, .inline-toolbar
-.button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
-.inline-toolbar .titlebar .button.titlebutton,
-.titlebar .inline-toolbar .button.titlebutton, .inline-toolbar
-.button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, .linked >
-.button, .header-bar .linked > .button.titlebutton,
-.titlebar .linked > .button.titlebutton, .linked >
-.button:hover, .linked >
-.button:active, .linked >
-.button:checked, .linked >
-.button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.inline-toolbar .header-bar GtkToolButton:backdrop > button.titlebutton,
+.header-bar .inline-toolbar GtkToolButton:backdrop > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:backdrop > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop > button.titlebutton, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton, .inline-toolbar button, .inline-toolbar .header-bar button.titlebutton, .header-bar .inline-toolbar button.titlebutton,
+.inline-toolbar .titlebar button.titlebutton,
+.titlebar .inline-toolbar button.titlebutton, .inline-toolbar button:backdrop, .linked > button, .header-bar .linked > button.titlebutton,
+.titlebar .linked > button.titlebutton, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
 .linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
 .linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .inline-toolbar
-.button:first-child, .linked > button:first-child, .linked >
-.button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:first-child > .button.titlebutton,
-.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat,
-.inline-toolbar GtkToolButton:backdrop:first-child > .button.flat,
-.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat,
-.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, .header-bar .linked > button.titlebutton:first-child,
+.titlebar .linked > button.titlebutton:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > button.flat, .inline-toolbar GtkToolButton:first-child > button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:first-child > button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:first-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:first-child > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton:backdrop:first-child > button.flat,
+.inline-toolbar GtkToolButton:backdrop:first-child > button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:first-child > button.flat,
+.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > button.flat,
 .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.inline-toolbar .header-bar GtkToolButton:backdrop:first-child > button.titlebutton,
+.header-bar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:backdrop:first-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > button.titlebutton, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .inline-toolbar
-.button:last-child, .linked > button:last-child, .linked >
-.button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
-.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat,
-.inline-toolbar GtkToolButton:backdrop:last-child > .button.flat,
-.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat,
-.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, .header-bar .linked > button.titlebutton:last-child,
+.titlebar .linked > button.titlebutton:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > button.flat, .inline-toolbar GtkToolButton:last-child > button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:last-child > button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:last-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:last-child > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton:backdrop:last-child > button.flat,
+.inline-toolbar GtkToolButton:backdrop:last-child > button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:last-child > button.flat,
+.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > button.flat,
 .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.inline-toolbar .header-bar GtkToolButton:backdrop:last-child > button.titlebutton,
+.header-bar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:backdrop:last-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > button.titlebutton, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .inline-toolbar
-.button:only-child, .linked > button:only-child, .linked >
-.button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:only-child > .button.titlebutton,
-.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat,
-.inline-toolbar GtkToolButton:backdrop:only-child > .button.flat,
-.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat,
-.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, .header-bar .linked > button.titlebutton:only-child,
+.titlebar .linked > button.titlebutton:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > button.flat, .inline-toolbar GtkToolButton:only-child > button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar .header-bar GtkToolButton:only-child > button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:only-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:only-child > button.titlebutton,
+.inline-toolbar.toolbar GtkToolButton:backdrop:only-child > button.flat,
+.inline-toolbar GtkToolButton:backdrop:only-child > button.flat,
+.inline-toolbar.search-bar GtkToolButton:backdrop:only-child > button.flat,
+.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > button.flat,
 .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
 .inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .sidebar-button.button,
-.inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.inline-toolbar .header-bar GtkToolButton:backdrop:only-child > button.titlebutton,
+.header-bar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton:backdrop:only-child > button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > button.titlebutton, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
 .linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical >
-.button, .linked.vertical >
-.button:hover, .linked.vertical >
-.button:active, .linked.vertical >
-.button:checked, .linked.vertical >
-.button:backdrop, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > entry, .linked.vertical > button, .header-bar .linked.vertical > button.titlebutton,
+.titlebar .linked.vertical > button.titlebutton, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > button:first-child, .linked.vertical >
-.button:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > entry:first-child, .linked.vertical > button:first-child, .header-bar .linked.vertical > button.titlebutton:first-child,
+.titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > button:last-child, .linked.vertical >
-.button:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > entry:last-child, .linked.vertical > button:last-child, .header-bar .linked.vertical > button.titlebutton:last-child,
+.titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > button:only-child, .linked.vertical >
-.button:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > entry:only-child, .linked.vertical > button:only-child, .header-bar .linked.vertical > button.titlebutton:only-child,
+.titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
-.titlebar .menuitem.titlebutton.button, .menuitem.button.flat:backdrop, .menuitem.sidebar-button.button:backdrop, .menuitem.button.flat:backdrop:hover, .menuitem.sidebar-button.button:backdrop:hover, .header-bar .menuitem.titlebutton.button:backdrop:hover,
-.titlebar .menuitem.titlebutton.button:backdrop:hover, .button:link, .header-bar .button.titlebutton:link,
-.titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
-.titlebar .button.titlebutton:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .menu.button, .header-bar .menu.button.titlebutton,
-.titlebar .menu.button.titlebutton, notebook tab .button, notebook tab .header-bar .button.titlebutton, .header-bar notebook tab .button.titlebutton,
-notebook tab .titlebar .button.titlebutton,
-.titlebar notebook tab .button.titlebutton, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
-.app-notification .titlebar .titlebutton.button,
-.titlebar .app-notification .titlebutton.button,
-.app-notification.frame .button.flat,
-.app-notification.frame .sidebar-button.button, .app-notification .button.flat:backdrop, .app-notification .sidebar-button.button:backdrop, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive,
-.app-notification .titlebar .titlebutton.button:backdrop:insensitive,
-.titlebar .app-notification .titlebutton.button:backdrop:insensitive,
-.app-notification.frame .button.flat:backdrop,
+.menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, button:link, .header-bar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, .menu button, .menu .header-bar button.titlebutton, .header-bar .menu button.titlebutton,
+.menu .titlebar button.titlebutton,
+.titlebar .menu button.titlebutton, notebook tab button, notebook tab .header-bar button.titlebutton, .header-bar notebook tab button.titlebutton,
+notebook tab .titlebar button.titlebutton,
+.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification button.titlebutton,
+.app-notification .titlebar button.titlebutton,
+.titlebar .app-notification button.titlebutton,
+.app-notification.frame button.flat,
+.app-notification.frame .sidebar-button.button, .app-notification button.flat:backdrop, .app-notification .sidebar-button.button:backdrop, .app-notification button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, .app-notification button.flat:backdrop:insensitive, .app-notification .sidebar-button.button:backdrop:insensitive, .app-notification .header-bar button.titlebutton:backdrop:insensitive, .header-bar .app-notification button.titlebutton:backdrop:insensitive,
+.app-notification .titlebar button.titlebutton:backdrop:insensitive,
+.titlebar .app-notification button.titlebutton:backdrop:insensitive,
+.app-notification.frame button.flat:backdrop,
 .app-notification.frame .sidebar-button.button:backdrop,
-.app-notification.frame .header-bar .button.titlebutton:backdrop,
-.header-bar .app-notification.frame .button.titlebutton:backdrop,
-.app-notification.frame .titlebar .button.titlebutton:backdrop,
-.titlebar .app-notification.frame .button.titlebutton:backdrop,
-.app-notification.frame .button.flat:insensitive,
+.app-notification.frame .header-bar button.titlebutton:backdrop,
+.header-bar .app-notification.frame button.titlebutton:backdrop,
+.app-notification.frame .titlebar button.titlebutton:backdrop,
+.titlebar .app-notification.frame button.titlebutton:backdrop,
+.app-notification.frame button.flat:insensitive,
 .app-notification.frame .sidebar-button.button:insensitive,
-.app-notification.frame .header-bar .button.titlebutton:insensitive,
-.header-bar .app-notification.frame .button.titlebutton:insensitive,
-.app-notification.frame .titlebar .button.titlebutton:insensitive,
-.titlebar .app-notification.frame .button.titlebutton:insensitive,
-.app-notification.frame .button.flat:backdrop:insensitive,
-.app-notification.frame .sidebar-button.button:backdrop:insensitive, calendar.button, .header-bar calendar.button.titlebutton,
-.titlebar calendar.button.titlebutton, calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive {
+.app-notification.frame .header-bar button.titlebutton:insensitive,
+.header-bar .app-notification.frame button.titlebutton:insensitive,
+.app-notification.frame .titlebar button.titlebutton:insensitive,
+.titlebar .app-notification.frame button.titlebutton:insensitive,
+.app-notification.frame button.flat:backdrop:insensitive,
+.app-notification.frame .sidebar-button.button:backdrop:insensitive, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:insensitive, .scale-popup button:hover, .scale-popup button:backdrop, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:insensitive {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -1449,15 +1187,12 @@ notebook tab .titlebar .button.titlebutton,
   icon-shadow: none; }
 
 /* menu buttons */
-.menuitem.button.flat, .menuitem.sidebar-button.button, .header-bar .menuitem.titlebutton.button,
-.titlebar .menuitem.titlebutton.button {
+.menuitem.button.flat {
   outline-offset: -1px; }
-  .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover, .header-bar .menuitem.titlebutton.button:hover,
-  .titlebar .menuitem.titlebutton.button:hover {
-    background-color: #d9dada; }
+  .menuitem.button.flat:hover {
+    background-color: #dadbdb; }
 
-GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
-.titlebar GtkColorButton.button.titlebutton {
+GtkColorButton.button {
   padding: 5px; }
   GtkColorButton.button GtkColorSwatch:first-child:last-child {
     border-radius: 0;
@@ -1468,49 +1203,53 @@ GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
 /*********
  * Links *
  *********/
-*:link, .button:link, .header-bar .button.titlebutton:link,
-.titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
-.titlebar .button.titlebutton:visited {
+*:link, button:link, .header-bar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+.titlebar button.titlebutton:visited {
   color: #2a76c6; }
-  *:link:visited, .button:visited, .header-bar .button.titlebutton:visited,
-  .titlebar .button.titlebutton:visited {
+  *:link:visited, button:visited, .header-bar button.titlebutton:visited,
+  .titlebar button.titlebutton:visited {
     color: #215d9c; }
-    *:selected *:link:visited, *:selected .button:visited {
-      color: #b6d2ef; }
-  *:link:hover, .button:hover:link, .button:hover:visited {
+    *:selected *:link:visited, *:selected button:visited:link, *:selected button:visited, *:selected .header-bar button.titlebutton:visited, .header-bar *:selected button.titlebutton:visited,
+    *:selected .titlebar button.titlebutton:visited,
+    .titlebar *:selected button.titlebutton:visited {
+      color: #b7d3f0; }
+  *:link:hover, button:hover:link, button:hover:visited {
     color: #4a90d9; }
-    *:selected *:link:hover, *:selected .button:hover:link, *:selected .button:hover:visited {
-      color: #ecf3fb; }
-  *:link:active, .button:active:link, .button:active:visited {
+    *:selected *:link:hover, *:selected button:hover:link, *:selected button:hover:visited {
+      color: #edf4fb; }
+  *:link:active, button:active:link, button:active:visited {
     color: #2a76c6; }
-    *:selected *:link:active, *:selected .button:active:link, *:selected .button:active:visited {
-      color: #dae8f7; }
-  *:link:backdrop, .button:backdrop:link, .button:backdrop:visited, *:link:backdrop:hover, .button:backdrop:hover:link, .button:backdrop:hover:visited, *:link:backdrop:hover:selected, .button:backdrop:hover:selected:link, .button:backdrop:hover:selected:visited, .titlebar.selection-mode .subtitle:backdrop:hover:link,
+    *:selected *:link:active, *:selected button:active:link, *:selected button:active:visited {
+      color: #dbe9f7; }
+  *:link:backdrop, button:backdrop:link, button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link, button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link, button:backdrop:hover:selected:visited, .titlebar.selection-mode .subtitle:backdrop:hover:link,
   .header-bar.selection-mode .subtitle:backdrop:hover:link {
     color: #4a90d9; }
-  *:link:selected, .button:selected:link, .button:selected:visited, .titlebar.selection-mode .subtitle:link,
-  .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected .button:link, *:selected .button:visited {
-    color: #dae8f7; }
+  *:link:selected, button:selected:link, button:selected:visited, .titlebar.selection-mode .subtitle:link,
+  .header-bar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, *:selected button:visited {
+    color: #dbe9f7; }
 
-.button:link, .header-bar .button.titlebutton:link,
-.titlebar .button.titlebutton:link, .button:visited, .header-bar .button.titlebutton:visited,
-.titlebar .button.titlebutton:visited {
+button:link, .header-bar button.titlebutton:link,
+.titlebar button.titlebutton:link, button:visited, .header-bar button.titlebutton:visited,
+.titlebar button.titlebutton:visited {
   text-shadow: none; }
-  .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked {
+  button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked {
     text-shadow: none; }
-  .button:link > label, .header-bar .button.titlebutton:link > label,
-  .titlebar .button.titlebutton:link > label, .button:visited > label, .header-bar .button.titlebutton:visited > label,
-  .titlebar .button.titlebutton:visited > label {
+  button:link > label, .header-bar button.titlebutton:link > label,
+  .titlebar button.titlebutton:link > label, button:visited > label, .header-bar button.titlebutton:visited > label,
+  .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
 /*****************
  * GtkSpinButton *
  *****************/
-spinbutton:not(.vertical) button {
+spinbutton:not(.vertical) button, spinbutton:not(.vertical) .header-bar button.titlebutton, .header-bar spinbutton:not(.vertical) button.titlebutton,
+spinbutton:not(.vertical) .titlebar button.titlebutton,
+.titlebar spinbutton:not(.vertical) button.titlebutton {
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(161, 161, 161, 0.3);
-  color: #42484a;
+  color: #43484a;
   border-radius: 0;
   box-shadow: none; }
   spinbutton:not(.vertical) button:dir(rtl) {
@@ -1519,13 +1258,13 @@ spinbutton:not(.vertical) button {
     color: #2e3436;
     background-color: rgba(46, 52, 54, 0.05); }
   spinbutton:not(.vertical) button:insensitive {
-    color: rgba(141, 144, 145, 0.3); }
+    color: rgba(142, 145, 146, 0.3); }
   spinbutton:not(.vertical) button:active {
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
     background-color: rgba(0, 0, 0, 0.1); }
   spinbutton:not(.vertical) button:backdrop {
-    color: #989b9c;
-    border-color: rgba(168, 168, 168, 0.3);
+    color: #999c9d;
+    border-color: rgba(169, 169, 169, 0.3);
     background-color: transparent; }
   spinbutton:not(.vertical) button:backdrop:insensitive {
     background-image: none;
@@ -1578,7 +1317,7 @@ spinbutton:not(.vertical) button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.5);
     icon-shadow: none;
     box-shadow: none; }
@@ -1586,7 +1325,9 @@ spinbutton:not(.vertical) button {
     border-radius: 0 3px 3px 0; }
   .osd spinbutton:not(.vertical) button:dir(rtl):first-child {
     border-radius: 3px 0 0 3px; }
-spinbutton.vertical button {
+spinbutton.vertical button, spinbutton.vertical .header-bar button.titlebutton, .header-bar spinbutton.vertical button.titlebutton,
+spinbutton.vertical .titlebar button.titlebutton,
+.titlebar spinbutton.vertical button.titlebutton {
   padding-top: 8px;
   padding-bottom: 8px; }
   spinbutton.vertical button:first-child {
@@ -1614,29 +1355,31 @@ spinbutton.vertical button {
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white; }
     spinbutton.vertical button:first-child:insensitive {
-      color: #8d9091;
+      color: #8e9192;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      spinbutton.vertical button:first-child:insensitive > .label {
+      spinbutton.vertical button:first-child:insensitive > .label, spinbutton.vertical .header-bar button.titlebutton:first-child:insensitive > .label,
+      spinbutton.vertical .titlebar button.titlebutton:first-child:insensitive > .label {
         color: inherit; }
     spinbutton.vertical button:first-child:backdrop {
-      color: #8d9091;
-      border-color: #a8a8a8;
+      color: #8e9192;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       spinbutton.vertical button:first-child:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:backdrop:insensitive > .label {
+        spinbutton.vertical button:first-child:backdrop:insensitive > .label, spinbutton.vertical .header-bar button.titlebutton:first-child:backdrop:insensitive > .label,
+        spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:insensitive > .label {
           color: inherit; }
 spinbutton.vertical button:first-child, spinbutton.vertical button:first-child:active, spinbutton.vertical button:first-child:hover, spinbutton.vertical button:first-child:insensitive, spinbutton.vertical button:first-child:backdrop {
   border-radius: 3px 3px 0 0;
@@ -1672,9 +1415,9 @@ spinbutton.vertical button:last-child {
     icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:insensitive {
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1706,11 +1449,11 @@ GtkComboBox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
-    color: #8d9091;
+    color: #8e9192;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop {
-    color: #8d9091;
+    color: #8e9192;
     text-shadow: none;
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
@@ -1725,11 +1468,11 @@ GtkComboBox {
   GtkComboBox.combobox-entry entry:dir(rtl) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0; }
-  GtkComboBox.combobox-entry .button:dir(ltr) {
+  GtkComboBox.combobox-entry button:dir(ltr) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     border-left-style: none; }
-  GtkComboBox.combobox-entry .button:dir(rtl) {
+  GtkComboBox.combobox-entry button:dir(rtl) {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-style: none; }
@@ -1762,8 +1505,8 @@ GtkComboBox {
   background-color: #d6d6d6;
   box-shadow: inset 0 2px 3px -1px #b6b6b6, 0 1px white; }
   .inline-toolbar:backdrop, .search-bar:backdrop, .location-bar:backdrop {
-    border-color: #a8a8a8;
-    background-color: #d4d4d4;
+    border-color: darkgray;
+    background-color: #d5d5d5;
     box-shadow: none; }
 
 /***************
@@ -1778,10 +1521,10 @@ GtkComboBox {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #f7f7f7, #ededed);
-  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px white; }
+  box-shadow: inset 0 -1px #dadada, inset 0 1px white; }
   .titlebar:backdrop,
   .header-bar:backdrop {
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-color: #ededed;
     background-image: none;
     box-shadow: inset 0 1px white; }
@@ -1805,238 +1548,249 @@ GtkComboBox {
     .titlebar .header-bar-separator:backdrop, .titlebar > GtkBox > separator.vertical:backdrop,
     .header-bar .header-bar-separator:backdrop,
     .header-bar > GtkBox > separator.vertical:backdrop {
-      border-image: linear-gradient(to bottom, rgba(168, 168, 168, 0.5)) 0 1/1px 1px; }
+      border-image: linear-gradient(to bottom, rgba(169, 169, 169, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode,
   .header-bar.selection-mode {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #184472;
     background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9);
-    box-shadow: inset 0 -1px #3875b4, inset 0 1px #a4c7ec; }
+    box-shadow: inset 0 -1px #3975b5, inset 0 1px #a5c8ec; }
     .titlebar.selection-mode:backdrop,
     .header-bar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
-      box-shadow: inset 0 1px #b6d2ef; }
-    .titlebar.selection-mode .button,
-    .header-bar.selection-mode .button {
+      box-shadow: inset 0 1px #b7d3f0; }
+    .titlebar.selection-mode button,
+    .header-bar.selection-mode button {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #1c5187;
       background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a4c7ec; }
-      .titlebar.selection-mode .button.flat, .titlebar.selection-mode .sidebar-button.button,
-      .titlebar.selection-mode .titlebutton.button,
-      .header-bar.selection-mode .button.flat,
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
+      .titlebar.selection-mode button.flat, .titlebar.selection-mode .sidebar-button.button,
+      .titlebar.selection-mode button.titlebutton,
+      .header-bar.selection-mode button.flat,
       .header-bar.selection-mode .sidebar-button.button,
-      .header-bar.selection-mode .titlebutton.button {
+      .header-bar.selection-mode button.titlebutton {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .titlebar.selection-mode .button:hover,
-      .header-bar.selection-mode .button:hover {
+      .titlebar.selection-mode button:hover,
+      .header-bar.selection-mode button:hover {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #1c5187;
         background-image: linear-gradient(to bottom, #85b4e5, #5b9add 40%, #4a90d9);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a4c7ec; }
-      .titlebar.selection-mode .button:active, .titlebar.selection-mode .button:checked,
-      .header-bar.selection-mode .button:active,
-      .header-bar.selection-mode .button:checked {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 1px #a5c8ec; }
+      .titlebar.selection-mode button:active, .titlebar.selection-mode button:checked,
+      .header-bar.selection-mode button:active,
+      .header-bar.selection-mode button:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #1c5187;
         background-image: linear-gradient(to bottom, #2b79cb, #2e7fd3 40%, #3583d5);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
         icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a4c7ec; }
-      .titlebar.selection-mode .button:backdrop, .titlebar.selection-mode .button.flat:backdrop, .titlebar.selection-mode .sidebar-button.button:backdrop,
-      .titlebar.selection-mode .titlebutton.button:backdrop,
-      .header-bar.selection-mode .button:backdrop,
-      .header-bar.selection-mode .button.flat:backdrop,
+        box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a5c8ec; }
+      .titlebar.selection-mode button:backdrop, .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode .sidebar-button.button:backdrop,
+      .titlebar.selection-mode button.titlebutton:backdrop,
+      .header-bar.selection-mode button:backdrop,
+      .header-bar.selection-mode button.flat:backdrop,
       .header-bar.selection-mode .sidebar-button.button:backdrop,
-      .header-bar.selection-mode .titlebutton.button:backdrop {
-        color: #dae8f7;
+      .header-bar.selection-mode button.titlebutton:backdrop {
+        color: #dbe9f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
         -gtk-image-effect: none;
         border-color: #184472; }
-        .titlebar.selection-mode .button:backdrop:active, .titlebar.selection-mode .button:backdrop:checked, .titlebar.selection-mode .button.flat:backdrop:active, .titlebar.selection-mode .sidebar-button.button:backdrop:active,
-        .titlebar.selection-mode .titlebutton.button:backdrop:active, .titlebar.selection-mode .button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
-        .titlebar.selection-mode .titlebutton.button:backdrop:checked,
-        .header-bar.selection-mode .button:backdrop:active,
-        .header-bar.selection-mode .button:backdrop:checked,
-        .header-bar.selection-mode .button.flat:backdrop:active,
+        .titlebar.selection-mode button:backdrop:active, .titlebar.selection-mode button:backdrop:checked, .titlebar.selection-mode button.flat:backdrop:active, .titlebar.selection-mode .sidebar-button.button:backdrop:active,
+        .titlebar.selection-mode button.titlebutton:backdrop:active, .titlebar.selection-mode button.flat:backdrop:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:checked,
+        .titlebar.selection-mode button.titlebutton:backdrop:checked,
+        .header-bar.selection-mode button:backdrop:active,
+        .header-bar.selection-mode button:backdrop:checked,
+        .header-bar.selection-mode button.flat:backdrop:active,
         .header-bar.selection-mode .sidebar-button.button:backdrop:active,
-        .header-bar.selection-mode .titlebutton.button:backdrop:active,
-        .header-bar.selection-mode .button.flat:backdrop:checked,
+        .header-bar.selection-mode button.titlebutton:backdrop:active,
+        .header-bar.selection-mode button.flat:backdrop:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:checked,
-        .header-bar.selection-mode .titlebutton.button:backdrop:checked {
-          color: #d4e3f3;
+        .header-bar.selection-mode button.titlebutton:backdrop:checked {
+          color: #d4e4f4;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-        .titlebar.selection-mode .button:backdrop:insensitive, .titlebar.selection-mode .button.flat:backdrop:insensitive, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive,
-        .titlebar.selection-mode .titlebutton.button:backdrop:insensitive,
-        .header-bar.selection-mode .button:backdrop:insensitive,
-        .header-bar.selection-mode .button.flat:backdrop:insensitive,
+        .titlebar.selection-mode button:backdrop:insensitive, .titlebar.selection-mode button.flat:backdrop:insensitive, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive,
+        .titlebar.selection-mode button.titlebutton:backdrop:insensitive,
+        .header-bar.selection-mode button:backdrop:insensitive,
+        .header-bar.selection-mode button.flat:backdrop:insensitive,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive,
-        .header-bar.selection-mode .titlebutton.button:backdrop:insensitive {
-          color: #9ac1e9;
-          border-color: #65a0de;
-          background-image: linear-gradient(to bottom, #65a0de);
+        .header-bar.selection-mode button.titlebutton:backdrop:insensitive {
+          color: #9bc2ea;
+          border-color: #65a1df;
+          background-image: linear-gradient(to bottom, #65a1df);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode .button:backdrop:insensitive > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
-          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .button.flat:backdrop:insensitive > .label,
+          .titlebar.selection-mode button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive > .label, .titlebar.selection-mode button.flat:backdrop:insensitive > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode button:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode button.flat:backdrop:insensitive > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive > .label {
+          .header-bar.selection-mode button.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
-        .titlebar.selection-mode .button:backdrop:insensitive:active, .titlebar.selection-mode .button:backdrop:insensitive:checked, .titlebar.selection-mode .button.flat:backdrop:insensitive:active, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
-        .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
-        .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked,
-        .header-bar.selection-mode .button:backdrop:insensitive:active,
-        .header-bar.selection-mode .button:backdrop:insensitive:checked,
-        .header-bar.selection-mode .button.flat:backdrop:insensitive:active,
+        .titlebar.selection-mode button:backdrop:insensitive:active, .titlebar.selection-mode button:backdrop:insensitive:checked, .titlebar.selection-mode button.flat:backdrop:insensitive:active, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
+        .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active, .titlebar.selection-mode button.flat:backdrop:insensitive:checked, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
+        .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked,
+        .header-bar.selection-mode button:backdrop:insensitive:active,
+        .header-bar.selection-mode button:backdrop:insensitive:checked,
+        .header-bar.selection-mode button.flat:backdrop:insensitive:active,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active,
-        .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active,
-        .header-bar.selection-mode .button.flat:backdrop:insensitive:checked,
+        .header-bar.selection-mode button.titlebutton:backdrop:insensitive:active,
+        .header-bar.selection-mode button.flat:backdrop:insensitive:checked,
         .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked,
-        .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked {
-          color: #8db8e6;
-          border-color: #5093da;
-          background-image: linear-gradient(to bottom, #5093da);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
+        .header-bar.selection-mode button.titlebutton:backdrop:insensitive:checked {
+          color: #8db9e8;
+          border-color: #5094db;
+          background-image: linear-gradient(to bottom, #5094db);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode .button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
-          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
-          .titlebar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .button.flat:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive:checked > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:active > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive:active > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:active > .label, .titlebar.selection-mode button.flat:backdrop:insensitive:checked > .label, .titlebar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label, .titlebar.selection-mode .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+          .titlebar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode button:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode button:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode button.flat:backdrop:insensitive:active > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:active > .label,
-          .header-bar.selection-mode .button.flat:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode button.titlebutton:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+          .header-bar.selection-mode button.flat:backdrop:insensitive:checked > .label,
           .header-bar.selection-mode .sidebar-button.button:backdrop:insensitive:checked > .label,
-          .header-bar.selection-mode .titlebutton.button:backdrop:insensitive:checked > .label {
+          .header-bar.selection-mode button.titlebutton:backdrop:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:backdrop:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode .button.flat:backdrop, .titlebar.selection-mode .sidebar-button.button:backdrop,
-      .titlebar.selection-mode .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive, .titlebar.selection-mode .sidebar-button.button:insensitive,
-      .titlebar.selection-mode .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
-      .titlebar.selection-mode .titlebutton.button:insensitive:backdrop,
-      .header-bar.selection-mode .button.flat:backdrop,
+      .titlebar.selection-mode button.flat:backdrop, .titlebar.selection-mode .sidebar-button.button:backdrop,
+      .titlebar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.flat:insensitive, .titlebar.selection-mode .sidebar-button.button:insensitive,
+      .titlebar.selection-mode button.titlebutton:insensitive, .titlebar.selection-mode button.flat:insensitive:backdrop, .titlebar.selection-mode .sidebar-button.button:insensitive:backdrop,
+      .titlebar.selection-mode button.titlebutton:insensitive:backdrop,
+      .header-bar.selection-mode button.flat:backdrop,
       .header-bar.selection-mode .sidebar-button.button:backdrop,
-      .header-bar.selection-mode .titlebutton.button:backdrop,
-      .header-bar.selection-mode .button.flat:insensitive,
+      .header-bar.selection-mode button.titlebutton:backdrop,
+      .header-bar.selection-mode button.flat:insensitive,
       .header-bar.selection-mode .sidebar-button.button:insensitive,
-      .header-bar.selection-mode .titlebutton.button:insensitive,
-      .header-bar.selection-mode .button.flat:insensitive:backdrop,
+      .header-bar.selection-mode button.titlebutton:insensitive,
+      .header-bar.selection-mode button.flat:insensitive:backdrop,
       .header-bar.selection-mode .sidebar-button.button:insensitive:backdrop,
-      .header-bar.selection-mode .titlebutton.button:insensitive:backdrop {
+      .header-bar.selection-mode button.titlebutton:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
         text-shadow: none;
         icon-shadow: none; }
-      .titlebar.selection-mode .button:insensitive,
-      .header-bar.selection-mode .button:insensitive {
-        color: #b2cfee;
+      .titlebar.selection-mode button:insensitive,
+      .header-bar.selection-mode button:insensitive {
+        color: #b2d0ef;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #65a0de);
+        background-image: linear-gradient(to bottom, #65a1df);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
-        .titlebar.selection-mode .button:insensitive > .label,
-        .header-bar.selection-mode .button:insensitive > .label {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
+        .titlebar.selection-mode button:insensitive > .label, .titlebar.selection-mode .header-bar button.titlebutton:insensitive > .label,
+        .header-bar.selection-mode button:insensitive > .label,
+        .header-bar.selection-mode .titlebar button.titlebutton:insensitive > .label {
           color: inherit; }
-        .titlebar.selection-mode .button:insensitive:active, .titlebar.selection-mode .button:insensitive:checked,
-        .header-bar.selection-mode .button:insensitive:active,
-        .header-bar.selection-mode .button:insensitive:checked {
-          color: #b9d3f0;
+        .titlebar.selection-mode button:insensitive:active, .titlebar.selection-mode button:insensitive:checked,
+        .header-bar.selection-mode button:insensitive:active,
+        .header-bar.selection-mode button:insensitive:checked {
+          color: #b9d4f1;
           border-color: #1c5187;
-          background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
-          .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > .label,
-          .header-bar.selection-mode .button:insensitive:active > .label,
-          .header-bar.selection-mode .button:insensitive:checked > .label {
+          background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
+          .titlebar.selection-mode button:insensitive:active > .label, .titlebar.selection-mode .header-bar button.titlebutton:insensitive:active > .label, .titlebar.selection-mode button:insensitive:checked > .label, .titlebar.selection-mode .header-bar button.titlebutton:insensitive:checked > .label,
+          .header-bar.selection-mode button:insensitive:active > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:insensitive:active > .label,
+          .header-bar.selection-mode button:insensitive:checked > .label,
+          .header-bar.selection-mode .titlebar button.titlebutton:insensitive:checked > .label {
             color: inherit; }
-      .titlebar.selection-mode .button.suggested-action,
-      .header-bar.selection-mode .button.suggested-action {
+      .titlebar.selection-mode button.suggested-action,
+      .header-bar.selection-mode button.suggested-action {
         color: #2e3436;
         outline-color: rgba(46, 52, 54, 0.3);
         border-color: #a1a1a1;
         background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
         text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-        box-shadow: inset 0 1px white, 0 1px #a4c7ec;
+        box-shadow: inset 0 1px white, 0 1px #a5c8ec;
         border-color: #184472; }
-        .titlebar.selection-mode .button.suggested-action:hover,
-        .header-bar.selection-mode .button.suggested-action:hover {
+        .titlebar.selection-mode button.suggested-action:hover,
+        .header-bar.selection-mode button.suggested-action:hover {
           color: #2e3436;
           outline-color: rgba(46, 52, 54, 0.3);
           border-color: #a1a1a1;
           background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
           text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
           icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-          box-shadow: inset 0 1px white, 0 1px #a4c7ec;
+          box-shadow: inset 0 1px white, 0 1px #a5c8ec;
           border-color: #184472; }
-        .titlebar.selection-mode .button.suggested-action:active,
-        .header-bar.selection-mode .button.suggested-action:active {
+        .titlebar.selection-mode button.suggested-action:active,
+        .header-bar.selection-mode button.suggested-action:active {
           color: #2e3436;
           outline-color: rgba(46, 52, 54, 0.3);
           border-color: #a1a1a1;
           background-image: linear-gradient(to bottom, #d6d6d6, gainsboro 40%, #e0e0e0);
           text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
           icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-          box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a4c7ec;
+          box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #a5c8ec;
           border-color: #184472; }
-        .titlebar.selection-mode .button.suggested-action:insensitive,
-        .header-bar.selection-mode .button.suggested-action:insensitive {
-          color: #8d9091;
+        .titlebar.selection-mode button.suggested-action:insensitive,
+        .header-bar.selection-mode button.suggested-action:insensitive {
+          color: #8e9192;
           border-color: #a1a1a1;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec;
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec;
           border-color: #184472; }
-          .titlebar.selection-mode .button.suggested-action:insensitive > .label,
-          .header-bar.selection-mode .button.suggested-action:insensitive > .label {
+          .titlebar.selection-mode button.suggested-action:insensitive > .label, .titlebar.selection-mode .header-bar button.suggested-action.titlebutton:insensitive > .label,
+          .header-bar.selection-mode button.suggested-action:insensitive > .label,
+          .header-bar.selection-mode .titlebar button.suggested-action.titlebutton:insensitive > .label {
             color: inherit; }
-        .titlebar.selection-mode .button.suggested-action:backdrop,
-        .header-bar.selection-mode .button.suggested-action:backdrop {
-          color: #8d9091;
-          border-color: #a8a8a8;
+        .titlebar.selection-mode button.suggested-action:backdrop,
+        .header-bar.selection-mode button.suggested-action:backdrop {
+          color: #8e9192;
+          border-color: darkgray;
           background-image: linear-gradient(to bottom, #ededed);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-        .titlebar.selection-mode .button.suggested-action:backdrop:insensitive,
-        .header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
+        .titlebar.selection-mode button.suggested-action:backdrop:insensitive,
+        .header-bar.selection-mode button.suggested-action:backdrop:insensitive {
           color: #c7c7c7;
-          border-color: #a8a8a8;
+          border-color: darkgray;
           background-image: linear-gradient(to bottom, #f4f4f4);
           text-shadow: none;
           icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(164, 199, 236, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(165, 200, 236, 0);
           border-color: #184472; }
-          .titlebar.selection-mode .button.suggested-action:backdrop:insensitive > .label,
-          .header-bar.selection-mode .button.suggested-action:backdrop:insensitive > .label {
+          .titlebar.selection-mode button.suggested-action:backdrop:insensitive > .label, .titlebar.selection-mode .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+          .header-bar.selection-mode button.suggested-action:backdrop:insensitive > .label,
+          .header-bar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
             color: inherit; }
     .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop,
     .header-bar.selection-mode .selection-menu,
@@ -2062,34 +1816,34 @@ GtkComboBox {
   .titlebar.default-decoration,
   .header-bar.default-decoration {
     padding: 4px; }
-    .titlebar.default-decoration .button,
-    .header-bar.default-decoration .button {
+    .titlebar.default-decoration button,
+    .header-bar.default-decoration button {
       padding: 5px; }
 
 /************
  * Pathbars *
  ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton {
+.path-bar button, .path-bar .header-bar button.titlebutton, .header-bar .path-bar button.titlebutton,
+.path-bar .titlebar button.titlebutton,
+.titlebar .path-bar button.titlebutton {
   padding: 5px 6px 6px; }
-  .path-bar .button:first-child {
+  .path-bar button:first-child {
     padding-left: 8px; }
-  .path-bar .button:last-child {
+  .path-bar button:last-child {
     padding-right: 8px; }
-  .path-bar .button:only-child {
+  .path-bar button:only-child {
     padding-left: 12px;
     padding-right: 12px; }
-  .path-bar .button label:last-child {
+  .path-bar button label:last-child {
     padding-left: 2px; }
-  .path-bar .button label:first-child {
+  .path-bar button label:first-child {
     padding-right: 2px; }
-  .path-bar .button label:only-child {
+  .path-bar button label:only-child {
     padding-right: 0;
     padding-left: 0; }
-  .path-bar .button image, .path-bar .header-bar .button.titlebutton image, .header-bar .path-bar .button.titlebutton image,
-  .path-bar .titlebar .button.titlebutton image,
-  .titlebar .path-bar .button.titlebutton image {
+  .path-bar button image, .path-bar .header-bar button.titlebutton image, .header-bar .path-bar button.titlebutton image,
+  .path-bar .titlebar button.titlebutton image,
+  .titlebar .path-bar button.titlebutton image {
     padding-top: 1px; }
 
 /**************
@@ -2101,15 +1855,15 @@ GtkTreeView.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #96999a;
+  border-left-color: #979a9b;
   border-top-color: #ededed; }
   GtkTreeView.view:selected {
     border-radius: 0; }
   GtkTreeView.view:selected, GtkTreeView.view:backdrop:selected {
-    border-left-color: #a4c7ec;
+    border-left-color: #a5c8ec;
     border-top-color: rgba(46, 52, 54, 0.1); }
   GtkTreeView.view:insensitive {
-    color: #8d9091; }
+    color: #8e9192; }
     GtkTreeView.view:insensitive:selected {
       color: #92bce8; }
       GtkTreeView.view:insensitive:selected:backdrop {
@@ -2119,29 +1873,29 @@ GtkTreeView.view {
   GtkTreeView.view.separator:backdrop {
     color: rgba(0, 0, 0, 0.1); }
   GtkTreeView.view:backdrop {
-    border-left-color: #bdbebf;
+    border-left-color: #bebfc0;
     border-top: #ededed; }
   GtkTreeView.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #3c6287; }
+    border-color: #3c6288; }
   GtkTreeView.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #6c7072; }
+    color: #6d7172; }
     GtkTreeView.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     GtkTreeView.view.expander:hover {
       color: #2e3436; }
     GtkTreeView.view.expander:selected {
-      color: #c8ddf3; }
+      color: #c9def4; }
       GtkTreeView.view.expander:selected:hover {
         color: #ffffff; }
       GtkTreeView.view.expander:selected:backdrop {
-        color: #c8ddf3; }
+        color: #c9def4; }
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
-      color: #afb1b2; }
+      color: #b0b2b3; }
   GtkTreeView.view.progressbar {
     color: #ffffff;
     border: 1px solid #184472;
@@ -2169,62 +1923,62 @@ GtkTreeView.view {
       border-style: solid;
       border-color: #4a90d9; }
 
-column-header .button, column-header .header-bar .button.titlebutton, .header-bar column-header .button.titlebutton,
-column-header .titlebar .button.titlebutton,
-.titlebar column-header .button.titlebutton {
-  color: #96999a;
+column-header button, column-header .header-bar button.titlebutton, .header-bar column-header button.titlebutton,
+column-header .titlebar button.titlebutton,
+.titlebar column-header button.titlebutton {
+  color: #979a9b;
   background-color: #ffffff;
   font-weight: bold;
   text-shadow: none;
   box-shadow: none; }
-  column-header .button:hover, column-header .header-bar .button.titlebutton:hover, .header-bar column-header .button.titlebutton:hover,
-  column-header .titlebar .button.titlebutton:hover,
-  .titlebar column-header .button.titlebutton:hover {
-    color: #626668;
+  column-header button:hover, column-header .header-bar button.titlebutton:hover, .header-bar column-header button.titlebutton:hover,
+  column-header .titlebar button.titlebutton:hover,
+  .titlebar column-header button.titlebutton:hover {
+    color: #636769;
     box-shadow: none;
     transition: none; }
-  column-header .button:active, column-header .header-bar .button.titlebutton:active, .header-bar column-header .button.titlebutton:active,
-  column-header .titlebar .button.titlebutton:active,
-  .titlebar column-header .button.titlebutton:active {
+  column-header button:active, column-header .header-bar button.titlebutton:active, .header-bar column-header button.titlebutton:active,
+  column-header .titlebar button.titlebutton:active,
+  .titlebar column-header button.titlebutton:active {
     color: #2e3436;
     transition: none; }
-column-header .button:last-child, column-header .header-bar .button.titlebutton:last-child, .header-bar column-header .button.titlebutton:last-child,
-column-header .titlebar .button.titlebutton:last-child,
-.titlebar column-header .button.titlebutton:last-child, column-header .button:last-child:backdrop, column-header:last-child.button, .header-bar column-header.button.titlebutton:last-child,
-.titlebar column-header.button.titlebutton:last-child, column-header:last-child.button:backdrop {
+column-header button:last-child, column-header .header-bar button.titlebutton:last-child, .header-bar column-header button.titlebutton:last-child,
+column-header .titlebar button.titlebutton:last-child,
+.titlebar column-header button.titlebutton:last-child, column-header button:last-child:backdrop, column-header:last-child button, column-header:last-child .header-bar button.titlebutton, .header-bar column-header:last-child button.titlebutton,
+column-header:last-child .titlebar button.titlebutton,
+.titlebar column-header:last-child button.titlebutton, column-header:last-child button:backdrop {
   border-right-style: none; }
 
-column-header.button.dnd, column-header .button.dnd, column-header .header-bar .dnd.button.titlebutton, .header-bar column-header .dnd.button.titlebutton,
-column-header .titlebar .dnd.button.titlebutton,
-.titlebar column-header .dnd.button.titlebutton, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover, .header-bar column-header.dnd.button.titlebutton,
-.titlebar column-header.dnd.button.titlebutton {
+column-header.button.dnd, column-header button.dnd, column-header .header-bar button.dnd.titlebutton, .header-bar column-header button.dnd.titlebutton,
+column-header .titlebar button.dnd.titlebutton,
+.titlebar column-header button.dnd.titlebutton, column-header.button.dnd:active, column-header.button.dnd:selected, column-header.button.dnd:hover {
   transition: none;
   color: #4a90d9;
   box-shadow: inset 1px 1px 0 1px #4a90d9, inset -1px 0 0 1px #4a90d9, inset 1px 1px #ffffff, inset -1px 0 #ffffff; }
 
-column-header .button, column-header .header-bar .button.titlebutton, .header-bar column-header .button.titlebutton,
-column-header .titlebar .button.titlebutton,
-.titlebar column-header .button.titlebutton, column-header .button:hover, column-header .button:active {
+column-header button, column-header .header-bar button.titlebutton, .header-bar column-header button.titlebutton,
+column-header .titlebar button.titlebutton,
+.titlebar column-header button.titlebutton, column-header button:hover, column-header button:active {
   padding: 3px 6px;
   border-style: none solid solid none;
   border-radius: 0;
   background-image: none;
   border-color: #ededed;
   text-shadow: none; }
-  column-header .button:insensitive, column-header .header-bar .button.titlebutton:insensitive, .header-bar column-header .button.titlebutton:insensitive,
-  column-header .titlebar .button.titlebutton:insensitive,
-  .titlebar column-header .button.titlebutton:insensitive {
+  column-header button:insensitive, column-header .header-bar button.titlebutton:insensitive, .header-bar column-header button.titlebutton:insensitive,
+  column-header .titlebar button.titlebutton:insensitive,
+  .titlebar column-header button.titlebutton:insensitive {
     border-color: #ededed;
     background-image: none; }
-  column-header .button:backdrop, column-header .header-bar .button.titlebutton:backdrop, .header-bar column-header .button.titlebutton:backdrop,
-  column-header .titlebar .button.titlebutton:backdrop,
-  .titlebar column-header .button.titlebutton:backdrop {
+  column-header button:backdrop, column-header .header-bar button.titlebutton:backdrop, .header-bar column-header button.titlebutton:backdrop,
+  column-header .titlebar button.titlebutton:backdrop,
+  .titlebar column-header button.titlebutton:backdrop {
     border-color: #ededed;
     border-style: none solid solid none;
-    color: #bdbebf;
+    color: #bebfc0;
     background-image: none;
     background-color: white; }
-    column-header .button:backdrop:insensitive {
+    column-header button:backdrop:insensitive {
       border-color: #ededed;
       background-image: none; }
 
@@ -2243,7 +1997,7 @@ column-header .titlebar .button.titlebutton,
       box-shadow: inset 0 -3px #4a90d9;
       color: #2a76c6; }
     .menubar > .menuitem:insensitive {
-      color: #8d9091;
+      color: #8e9192;
       box-shadow: none; }
 
 .menu {
@@ -2260,27 +2014,28 @@ column-header .titlebar .button.titlebutton,
       color: #ffffff;
       background-color: #4a90d9; }
     .menu .menuitem:insensitive {
-      color: #8d9091; }
+      color: #8e9192; }
       .menu .menuitem:insensitive:backdrop {
         color: #c7c7c7; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
-      color: #8d9091;
+      color: #8e9192;
       background-color: white; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
-  .menu.button, .header-bar .menu.button.titlebutton,
-  .titlebar .menu.button.titlebutton {
+  .menu button, .menu .header-bar button.titlebutton, .header-bar .menu button.titlebutton,
+  .menu .titlebar button.titlebutton,
+  .titlebar .menu button.titlebutton {
     border-style: none;
     border-radius: 0; }
-    .menu.button.top {
-      border-bottom: 1px solid #eaeaea; }
-    .menu.button.bottom {
-      border-top: 1px solid #eaeaea; }
-    .menu.button:hover {
-      background-color: #eaeaea; }
-    .menu.button:insensitive {
+    .menu button.top {
+      border-bottom: 1px solid #eaebeb; }
+    .menu button.bottom {
+      border-top: 1px solid #eaebeb; }
+    .menu button:hover {
+      background-color: #eaebeb; }
+    .menu button:insensitive {
       color: transparent;
       background-color: transparent;
       border-color: transparent; }
@@ -2307,15 +2062,15 @@ column-header .titlebar .button.titlebutton,
   .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
-  .popover .button.flat, .popover .sidebar-button.button, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
-  .popover .titlebar .titlebutton.button,
-  .titlebar .popover .titlebutton.button,
-  .popover .button.flat:hover,
+  .popover button.flat, .popover .sidebar-button.button, .popover .header-bar button.titlebutton, .header-bar .popover button.titlebutton,
+  .popover .titlebar button.titlebutton,
+  .titlebar .popover button.titlebutton,
+  .popover button.flat:hover,
   .popover .sidebar-button.button:hover,
-  .popover .header-bar .titlebutton.button:hover,
-  .header-bar .popover .titlebutton.button:hover,
-  .popover .titlebar .titlebutton.button:hover,
-  .titlebar .popover .titlebutton.button:hover {
+  .popover .header-bar button.titlebutton:hover,
+  .header-bar .popover button.titlebutton:hover,
+  .popover .titlebar button.titlebutton:hover,
+  .titlebar .popover button.titlebutton:hover {
     text-shadow: none;
     transition: none; }
 
@@ -2347,7 +2102,7 @@ notebook {
     notebook.frame.left {
       border-left-width: 0; }
     notebook.frame:backdrop {
-      border-color: #a8a8a8; }
+      border-color: darkgray; }
   notebook.header {
     background-color: #d6d6d6; }
     notebook.header.frame {
@@ -2361,25 +2116,25 @@ notebook {
       notebook.header.frame.left {
         border-right-width: 0; }
       notebook.header.frame:backdrop {
-        border-color: #a8a8a8; }
+        border-color: darkgray; }
     notebook.header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #a1a1a1; }
       notebook.header.top:backdrop {
-        box-shadow: inset 0 -1px #a8a8a8; }
+        box-shadow: inset 0 -1px darkgray; }
     notebook.header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #a1a1a1; }
       notebook.header.bottom:backdrop {
-        box-shadow: inset 0 1px #a8a8a8; }
+        box-shadow: inset 0 1px darkgray; }
     notebook.header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #a1a1a1; }
       notebook.header.right:backdrop {
-        box-shadow: inset 1px 0 #a8a8a8; }
+        box-shadow: inset 1px 0 darkgray; }
     notebook.header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #a1a1a1; }
       notebook.header.left:backdrop {
-        box-shadow: inset -1px 0 #a8a8a8; }
+        box-shadow: inset -1px 0 darkgray; }
     notebook.header:backdrop {
-      background-color: #d4d4d4;
+      background-color: #d5d5d5;
       box-shadow: none; }
   notebook tab {
     border-width: 0;
@@ -2456,7 +2211,7 @@ notebook {
         notebook tab.reorderable-page.top:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         notebook tab.reorderable-page.top:active:backdrop {
-          border-color: #a8a8a8;
+          border-color: darkgray;
           background-color: #ededed;
           border-bottom-color: #4a90d9; }
       notebook tab.reorderable-page.top:backdrop {
@@ -2475,7 +2230,7 @@ notebook {
         notebook tab.reorderable-page.bottom:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         notebook tab.reorderable-page.bottom:active:backdrop {
-          border-color: #a8a8a8;
+          border-color: darkgray;
           background-color: #ededed;
           border-top-color: #4a90d9; }
       notebook tab.reorderable-page.bottom:backdrop {
@@ -2494,7 +2249,7 @@ notebook {
         notebook tab.reorderable-page.left:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         notebook tab.reorderable-page.left:active:backdrop {
-          border-color: #a8a8a8;
+          border-color: darkgray;
           background-color: #ededed;
           border-right-color: #4a90d9; }
       notebook tab.reorderable-page.left:backdrop {
@@ -2513,7 +2268,7 @@ notebook {
         notebook tab.reorderable-page.right:active:hover {
           background-color: rgba(237, 237, 237, 0.7); }
         notebook tab.reorderable-page.right:active:backdrop {
-          border-color: #a8a8a8;
+          border-color: darkgray;
           background-color: #ededed;
           border-left-color: #4a90d9; }
       notebook tab.reorderable-page.right:backdrop {
@@ -2522,28 +2277,28 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #8d9091; }
+      color: #8e9192; }
       notebook tab label:backdrop {
-        color: #aaabac; }
+        color: #abacad; }
     notebook tab:hover label {
-      color: #5d6263; }
+      color: #5e6364; }
       notebook tab:hover label:backdrop {
-        color: #aaabac; }
+        color: #abacad; }
     notebook tab:active label {
       color: #2e3436; }
       notebook tab:active label:backdrop {
-        color: #8d9091; }
-    notebook tab .button, notebook tab .header-bar .button.titlebutton, .header-bar notebook tab .button.titlebutton,
-    notebook tab .titlebar .button.titlebutton,
-    .titlebar notebook tab .button.titlebutton {
+        color: #8e9192; }
+    notebook tab button, notebook tab .header-bar button.titlebutton, .header-bar notebook tab button.titlebutton,
+    notebook tab .titlebar button.titlebutton,
+    .titlebar notebook tab button.titlebutton {
       padding: 0;
       border: 1px solid transparent;
       icon-shadow: none;
       transition: none;
       color: rgba(46, 52, 54, 0.3); }
-      notebook tab .button:hover, notebook tab .header-bar .button.titlebutton:hover, .header-bar notebook tab .button.titlebutton:hover,
-      notebook tab .titlebar .button.titlebutton:hover,
-      .titlebar notebook tab .button.titlebutton:hover {
+      notebook tab button:hover, notebook tab .header-bar button.titlebutton:hover, .header-bar notebook tab button.titlebutton:hover,
+      notebook tab .titlebar button.titlebutton:hover,
+      .titlebar notebook tab button.titlebutton:hover {
         color: #2e3436;
         color: #2e3436;
         outline-color: rgba(46, 52, 54, 0.3);
@@ -2554,9 +2309,9 @@ notebook {
         box-shadow: inset 0 1px white;
         background-image: none;
         box-shadow: none; }
-      notebook tab .button:active, notebook tab .header-bar .button.titlebutton:active, .header-bar notebook tab .button.titlebutton:active,
-      notebook tab .titlebar .button.titlebutton:active,
-      .titlebar notebook tab .button.titlebutton:active {
+      notebook tab button:active, notebook tab .header-bar button.titlebutton:active, .header-bar notebook tab button.titlebutton:active,
+      notebook tab .titlebar button.titlebutton:active,
+      .titlebar notebook tab button.titlebutton:active {
         color: #2e3436;
         outline-color: rgba(46, 52, 54, 0.3);
         border-color: #a1a1a1;
@@ -2564,25 +2319,25 @@ notebook {
         text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-      notebook tab .button:backdrop, notebook tab .header-bar .button.titlebutton:backdrop, .header-bar notebook tab .button.titlebutton:backdrop,
-      notebook tab .titlebar .button.titlebutton:backdrop,
-      .titlebar notebook tab .button.titlebutton:backdrop {
-        color: rgba(141, 144, 145, 0.3);
+      notebook tab button:backdrop, notebook tab .header-bar button.titlebutton:backdrop, .header-bar notebook tab button.titlebutton:backdrop,
+      notebook tab .titlebar button.titlebutton:backdrop,
+      .titlebar notebook tab button.titlebutton:backdrop {
+        color: rgba(142, 145, 146, 0.3);
         border-color: transparent; }
-      notebook tab .button > image, notebook tab .header-bar .button.titlebutton > image, .header-bar notebook tab .button.titlebutton > image,
-      notebook tab .titlebar .button.titlebutton > image,
-      .titlebar notebook tab .button.titlebutton > image {
+      notebook tab button > image, notebook tab .header-bar button.titlebutton > image, .header-bar notebook tab button.titlebutton > image,
+      notebook tab .titlebar button.titlebutton > image,
+      .titlebar notebook tab button.titlebutton > image {
         padding: 2px; }
   notebook.arrow {
-    color: #8d9091; }
+    color: #8e9192; }
     notebook.arrow:hover {
-      color: #5d6263; }
+      color: #5e6364; }
     notebook.arrow:active {
       color: #2e3436; }
     notebook.arrow:insensitive {
-      color: rgba(141, 144, 145, 0.3); }
+      color: rgba(142, 145, 146, 0.3); }
     notebook.arrow:backdrop {
-      color: rgba(141, 144, 145, 0.4); }
+      color: rgba(142, 145, 146, 0.4); }
       notebook.arrow:backdrop:insensitive {
         color: #c7c7c7; }
 
@@ -2597,9 +2352,9 @@ notebook {
   -GtkScrollbar-min-slider-length: 42;
   -GtkRange-stepper-spacing: 0;
   -GtkRange-trough-under-steppers: 1; }
-  .scrollbar .button, .scrollbar .header-bar .button.titlebutton, .header-bar .scrollbar .button.titlebutton,
-  .scrollbar .titlebar .button.titlebutton,
-  .titlebar .scrollbar .button.titlebutton {
+  .scrollbar button, .scrollbar .header-bar button.titlebutton, .header-bar .scrollbar button.titlebutton,
+  .scrollbar .titlebar button.titlebutton,
+  .titlebar .scrollbar button.titlebutton {
     border: none; }
   .scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
     opacity: 0.4;
@@ -2625,15 +2380,15 @@ notebook {
     border: 1px none #a1a1a1; }
     .scrollbar .trough:backdrop {
       background-color: #e5e5e5;
-      border-color: #a8a8a8; }
+      border-color: darkgray; }
   .scrollbar .slider {
     background-color: #7a7e7f; }
     .scrollbar .slider:hover {
-      background-color: #54595a; }
+      background-color: #54595b; }
     .scrollbar .slider:prelight:active {
       background-color: #2a76c6; }
     .scrollbar .slider:backdrop {
-      background-color: #c6c7c8; }
+      background-color: #c7c8c9; }
     .scrollbar .slider:insensitive {
       background-color: transparent; }
   .scrollbar .slider {
@@ -2673,7 +2428,7 @@ notebook {
     border-image-slice: 0 1 0 0; }
   .scrollbars-junction:backdrop,
   .scrollbars-junction.frame:backdrop {
-    border-image-source: linear-gradient(to bottom, #a8a8a8 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, darkgray 1px, transparent 1px);
     background-color: #e5e5e5; }
 
 /**********
@@ -2691,7 +2446,7 @@ switch {
   border: 1px solid #a1a1a1;
   border-radius: 3px;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, #cecece);
+  background-image: linear-gradient(to bottom, #cfcfcf);
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
   switch:active {
     background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);
@@ -2700,16 +2455,16 @@ switch {
     box-shadow: 0 1px white;
     text-shadow: 0 1px rgba(24, 68, 114, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:insensitive {
-    color: #8d9091;
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: none;
     background-color: #f4f4f4;
     box-shadow: 0 1px white;
     text-shadow: none; }
   switch:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
-    background-image: linear-gradient(to bottom, #d4d4d4);
+    color: #8e9192;
+    border-color: darkgray;
+    background-image: linear-gradient(to bottom, #d5d5d5);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2719,7 +2474,7 @@ switch {
       box-shadow: none; }
   switch:insensitive {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: none;
     background-color: #f4f4f4; }
   switch slider {
@@ -2745,7 +2500,7 @@ switch {
   switch:active slider {
     border: 1px solid #184472; }
   switch:insensitive slider {
-    color: #8d9091;
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -2754,8 +2509,8 @@ switch {
     switch:insensitive slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #8d9091;
-    border-color: #a8a8a8;
+    color: #8e9192;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -2765,7 +2520,7 @@ switch {
     border-color: #4a90d9; }
   switch:backdrop:insensitive slider {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
@@ -2791,8 +2546,9 @@ switch {
 .check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check.button.flat, .check.sidebar-button.button, .header-bar .check.titlebutton.button,
-  .titlebar .check.titlebutton.button {
+  .check button.flat, .check .sidebar-button.button, .check .header-bar button.titlebutton, .header-bar .check button.titlebutton,
+  .check .titlebar button.titlebutton,
+  .titlebar .check button.titlebutton {
     icon-shadow: none; }
 
 .view.check:selected, calendar.check:selected,
@@ -2802,8 +2558,9 @@ switch {
 .check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover.png"), url("assets/checkbox-unchecked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:hover.button.flat, .check.sidebar-button.button:hover, .header-bar .check.titlebutton.button:hover,
-  .titlebar .check.titlebutton.button:hover {
+  .check:hover button.flat, .check:hover .sidebar-button.button, .check:hover .header-bar button.titlebutton, .header-bar .check:hover button.titlebutton,
+  .check:hover .titlebar button.titlebutton,
+  .titlebar .check:hover button.titlebutton {
     icon-shadow: none; }
 
 .view.check:hover:selected, calendar.check:hover:selected,
@@ -2813,8 +2570,9 @@ switch {
 .check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active.png"), url("assets/checkbox-unchecked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:active.button.flat, .check.sidebar-button.button:active, .header-bar .check.titlebutton.button:active,
-  .titlebar .check.titlebutton.button:active {
+  .check:active button.flat, .check:active .sidebar-button.button, .check:active .header-bar button.titlebutton, .header-bar .check:active button.titlebutton,
+  .check:active .titlebar button.titlebutton,
+  .titlebar .check:active button.titlebutton {
     icon-shadow: none; }
 
 .view.check:active:selected, calendar.check:active:selected,
@@ -2824,8 +2582,9 @@ switch {
 .check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:insensitive.button.flat, .check.sidebar-button.button:insensitive, .header-bar .check.titlebutton.button:insensitive,
-  .titlebar .check.titlebutton.button:insensitive {
+  .check:insensitive button.flat, .check:insensitive .sidebar-button.button, .check:insensitive .header-bar button.titlebutton, .header-bar .check:insensitive button.titlebutton,
+  .check:insensitive .titlebar button.titlebutton,
+  .titlebar .check:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.check:insensitive:selected, calendar.check:insensitive:selected,
@@ -2835,8 +2594,9 @@ switch {
 .check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop.png"), url("assets/checkbox-unchecked-backdrop@2.png"));
   icon-shadow: none; }
-  .check:backdrop.button.flat, .check.sidebar-button.button:backdrop, .header-bar .check.titlebutton.button:backdrop,
-  .titlebar .check.titlebutton.button:backdrop {
+  .check:backdrop button.flat, .check:backdrop .sidebar-button.button, .check:backdrop .header-bar button.titlebutton, .header-bar .check:backdrop button.titlebutton,
+  .check:backdrop .titlebar button.titlebutton,
+  .titlebar .check:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .view.check:backdrop:selected, calendar.check:backdrop:selected,
@@ -2846,8 +2606,9 @@ switch {
 .check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive.png"), url("assets/checkbox-unchecked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .check:backdrop:insensitive.button.flat, .check.sidebar-button.button:backdrop:insensitive, .header-bar .check.titlebutton.button:backdrop:insensitive,
-  .titlebar .check.titlebutton.button:backdrop:insensitive {
+  .check:backdrop:insensitive button.flat, .check:backdrop:insensitive .sidebar-button.button, .check:backdrop:insensitive .header-bar button.titlebutton, .header-bar .check:backdrop:insensitive button.titlebutton,
+  .check:backdrop:insensitive .titlebar button.titlebutton,
+  .titlebar .check:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.check:backdrop:insensitive:selected, calendar.check:backdrop:insensitive:selected,
@@ -2857,8 +2618,9 @@ switch {
 .check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:inconsistent.button.flat, .check.sidebar-button.button:inconsistent, .header-bar .check.titlebutton.button:inconsistent,
-  .titlebar .check.titlebutton.button:inconsistent {
+  .check:inconsistent button.flat, .check:inconsistent .sidebar-button.button, .check:inconsistent .header-bar button.titlebutton, .header-bar .check:inconsistent button.titlebutton,
+  .check:inconsistent .titlebar button.titlebutton,
+  .titlebar .check:inconsistent button.titlebutton {
     icon-shadow: none; }
 
 .view.check:inconsistent:selected, calendar.check:inconsistent:selected,
@@ -2868,8 +2630,9 @@ switch {
 .check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover.png"), url("assets/checkbox-mixed-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:inconsistent:hover.button.flat, .check.sidebar-button.button:inconsistent:hover, .header-bar .check.titlebutton.button:inconsistent:hover,
-  .titlebar .check.titlebutton.button:inconsistent:hover {
+  .check:inconsistent:hover button.flat, .check:inconsistent:hover .sidebar-button.button, .check:inconsistent:hover .header-bar button.titlebutton, .header-bar .check:inconsistent:hover button.titlebutton,
+  .check:inconsistent:hover .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
 
 .view.check:inconsistent:hover:selected, calendar.check:inconsistent:hover:selected,
@@ -2879,8 +2642,9 @@ switch {
 .check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active.png"), url("assets/checkbox-mixed-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:inconsistent:selected.button.flat, .check.sidebar-button.button:inconsistent:selected, .header-bar .check.titlebutton.button:inconsistent:selected,
-  .titlebar .check.titlebutton.button:inconsistent:selected {
+  .check:inconsistent:selected button.flat, .check:inconsistent:selected .sidebar-button.button, .check:inconsistent:selected .header-bar button.titlebutton, .header-bar .check:inconsistent:selected button.titlebutton,
+  .check:inconsistent:selected .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
 
 .view.check:inconsistent:selected:selected, calendar.check:inconsistent:selected,
@@ -2890,8 +2654,9 @@ switch {
 .check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop.png"), url("assets/checkbox-mixed-backdrop@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:backdrop.button.flat, .check.sidebar-button.button:inconsistent:backdrop, .header-bar .check.titlebutton.button:inconsistent:backdrop,
-  .titlebar .check.titlebutton.button:inconsistent:backdrop {
+  .check:inconsistent:backdrop button.flat, .check:inconsistent:backdrop .sidebar-button.button, .check:inconsistent:backdrop .header-bar button.titlebutton, .header-bar .check:inconsistent:backdrop button.titlebutton,
+  .check:inconsistent:backdrop .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .view.check:inconsistent:backdrop:selected, calendar.check:inconsistent:backdrop:selected,
@@ -2901,8 +2666,9 @@ switch {
 .check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:inconsistent:insensitive.button.flat, .check.sidebar-button.button:inconsistent:insensitive, .header-bar .check.titlebutton.button:inconsistent:insensitive,
-  .titlebar .check.titlebutton.button:inconsistent:insensitive {
+  .check:inconsistent:insensitive button.flat, .check:inconsistent:insensitive .sidebar-button.button, .check:inconsistent:insensitive .header-bar button.titlebutton, .header-bar .check:inconsistent:insensitive button.titlebutton,
+  .check:inconsistent:insensitive .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.check:inconsistent:insensitive:selected, calendar.check:inconsistent:insensitive:selected,
@@ -2912,8 +2678,9 @@ switch {
 .check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive.png"), url("assets/checkbox-mixed-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .check:inconsistent:insensitive:backdrop.button.flat, .check.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .check.titlebutton.button:inconsistent:insensitive:backdrop,
-  .titlebar .check.titlebutton.button:inconsistent:insensitive:backdrop {
+  .check:inconsistent:insensitive:backdrop button.flat, .check:inconsistent:insensitive:backdrop .sidebar-button.button, .check:inconsistent:insensitive:backdrop .header-bar button.titlebutton, .header-bar .check:inconsistent:insensitive:backdrop button.titlebutton,
+  .check:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
+  .titlebar .check:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .view.check:inconsistent:insensitive:backdrop:selected, calendar.check:inconsistent:insensitive:backdrop:selected,
@@ -2923,8 +2690,9 @@ switch {
 .check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:checked.button.flat, .check.sidebar-button.button:checked, .header-bar .check.titlebutton.button:checked,
-  .titlebar .check.titlebutton.button:checked {
+  .check:checked button.flat, .check:checked .sidebar-button.button, .check:checked .header-bar button.titlebutton, .header-bar .check:checked button.titlebutton,
+  .check:checked .titlebar button.titlebutton,
+  .titlebar .check:checked button.titlebutton {
     icon-shadow: none; }
 
 .view.check:checked:selected, calendar.check:checked:selected,
@@ -2934,8 +2702,9 @@ switch {
 .check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:checked:insensitive.button.flat, .check.sidebar-button.button:checked:insensitive, .header-bar .check.titlebutton.button:checked:insensitive,
-  .titlebar .check.titlebutton.button:checked:insensitive {
+  .check:checked:insensitive button.flat, .check:checked:insensitive .sidebar-button.button, .check:checked:insensitive .header-bar button.titlebutton, .header-bar .check:checked:insensitive button.titlebutton,
+  .check:checked:insensitive .titlebar button.titlebutton,
+  .titlebar .check:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.check:checked:insensitive:selected, calendar.check:checked:insensitive:selected,
@@ -2945,8 +2714,9 @@ switch {
 .check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover.png"), url("assets/checkbox-checked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:checked:hover.button.flat, .check.sidebar-button.button:checked:hover, .header-bar .check.titlebutton.button:checked:hover,
-  .titlebar .check.titlebutton.button:checked:hover {
+  .check:checked:hover button.flat, .check:checked:hover .sidebar-button.button, .check:checked:hover .header-bar button.titlebutton, .header-bar .check:checked:hover button.titlebutton,
+  .check:checked:hover .titlebar button.titlebutton,
+  .titlebar .check:checked:hover button.titlebutton {
     icon-shadow: none; }
 
 .view.check:checked:hover:selected, calendar.check:checked:hover:selected,
@@ -2956,8 +2726,9 @@ switch {
 .check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active.png"), url("assets/checkbox-checked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .check:checked:active.button.flat, .check.sidebar-button.button:checked:active, .header-bar .check.titlebutton.button:checked:active,
-  .titlebar .check.titlebutton.button:checked:active {
+  .check:checked:active button.flat, .check:checked:active .sidebar-button.button, .check:checked:active .header-bar button.titlebutton, .header-bar .check:checked:active button.titlebutton,
+  .check:checked:active .titlebar button.titlebutton,
+  .titlebar .check:checked:active button.titlebutton {
     icon-shadow: none; }
 
 .view.check:checked:active:selected, calendar.check:checked:active:selected,
@@ -2967,8 +2738,9 @@ switch {
 .check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop.png"), url("assets/checkbox-checked-backdrop@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked.button.flat, .check.sidebar-button.button:backdrop:checked, .header-bar .check.titlebutton.button:backdrop:checked,
-  .titlebar .check.titlebutton.button:backdrop:checked {
+  .check:backdrop:checked button.flat, .check:backdrop:checked .sidebar-button.button, .check:backdrop:checked .header-bar button.titlebutton, .header-bar .check:backdrop:checked button.titlebutton,
+  .check:backdrop:checked .titlebar button.titlebutton,
+  .titlebar .check:backdrop:checked button.titlebutton {
     icon-shadow: none; }
 
 .view.check:backdrop:checked:selected, calendar.check:backdrop:checked:selected,
@@ -2978,8 +2750,9 @@ switch {
 .check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"), url("assets/checkbox-checked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .check:backdrop:checked:insensitive.button.flat, .check.sidebar-button.button:backdrop:checked:insensitive, .header-bar .check.titlebutton.button:backdrop:checked:insensitive,
-  .titlebar .check.titlebutton.button:backdrop:checked:insensitive {
+  .check:backdrop:checked:insensitive button.flat, .check:backdrop:checked:insensitive .sidebar-button.button, .check:backdrop:checked:insensitive .header-bar button.titlebutton, .header-bar .check:backdrop:checked:insensitive button.titlebutton,
+  .check:backdrop:checked:insensitive .titlebar button.titlebutton,
+  .titlebar .check:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.check:backdrop:checked:insensitive:selected, calendar.check:backdrop:checked:insensitive:selected,
@@ -2997,13 +2770,14 @@ switch {
   .menu .menuitem.check:hover {
     color: #ffffff; }
   .menu .menuitem.check:insensitive {
-    color: #bdbebf; }
+    color: #bebfc0; }
 
 .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio.button.flat, .radio.sidebar-button.button, .header-bar .radio.titlebutton.button,
-  .titlebar .radio.titlebutton.button {
+  .radio button.flat, .radio .sidebar-button.button, .radio .header-bar button.titlebutton, .header-bar .radio button.titlebutton,
+  .radio .titlebar button.titlebutton,
+  .titlebar .radio button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:selected, calendar.radio:selected,
@@ -3013,8 +2787,9 @@ switch {
 .radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover.png"), url("assets/radio-unchecked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:hover.button.flat, .radio.sidebar-button.button:hover, .header-bar .radio.titlebutton.button:hover,
-  .titlebar .radio.titlebutton.button:hover {
+  .radio:hover button.flat, .radio:hover .sidebar-button.button, .radio:hover .header-bar button.titlebutton, .header-bar .radio:hover button.titlebutton,
+  .radio:hover .titlebar button.titlebutton,
+  .titlebar .radio:hover button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:hover:selected, calendar.radio:hover:selected,
@@ -3024,8 +2799,9 @@ switch {
 .radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active.png"), url("assets/radio-unchecked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:active.button.flat, .radio.sidebar-button.button:active, .header-bar .radio.titlebutton.button:active,
-  .titlebar .radio.titlebutton.button:active {
+  .radio:active button.flat, .radio:active .sidebar-button.button, .radio:active .header-bar button.titlebutton, .header-bar .radio:active button.titlebutton,
+  .radio:active .titlebar button.titlebutton,
+  .titlebar .radio:active button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:active:selected, calendar.radio:active:selected,
@@ -3035,8 +2811,9 @@ switch {
 .radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:insensitive.button.flat, .radio.sidebar-button.button:insensitive, .header-bar .radio.titlebutton.button:insensitive,
-  .titlebar .radio.titlebutton.button:insensitive {
+  .radio:insensitive button.flat, .radio:insensitive .sidebar-button.button, .radio:insensitive .header-bar button.titlebutton, .header-bar .radio:insensitive button.titlebutton,
+  .radio:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:insensitive:selected, calendar.radio:insensitive:selected,
@@ -3046,8 +2823,9 @@ switch {
 .radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop.png"), url("assets/radio-unchecked-backdrop@2.png"));
   icon-shadow: none; }
-  .radio:backdrop.button.flat, .radio.sidebar-button.button:backdrop, .header-bar .radio.titlebutton.button:backdrop,
-  .titlebar .radio.titlebutton.button:backdrop {
+  .radio:backdrop button.flat, .radio:backdrop .sidebar-button.button, .radio:backdrop .header-bar button.titlebutton, .header-bar .radio:backdrop button.titlebutton,
+  .radio:backdrop .titlebar button.titlebutton,
+  .titlebar .radio:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:backdrop:selected, calendar.radio:backdrop:selected,
@@ -3057,8 +2835,9 @@ switch {
 .radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive.png"), url("assets/radio-unchecked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:insensitive.button.flat, .radio.sidebar-button.button:backdrop:insensitive, .header-bar .radio.titlebutton.button:backdrop:insensitive,
-  .titlebar .radio.titlebutton.button:backdrop:insensitive {
+  .radio:backdrop:insensitive button.flat, .radio:backdrop:insensitive .sidebar-button.button, .radio:backdrop:insensitive .header-bar button.titlebutton, .header-bar .radio:backdrop:insensitive button.titlebutton,
+  .radio:backdrop:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:backdrop:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:backdrop:insensitive:selected, calendar.radio:backdrop:insensitive:selected,
@@ -3068,8 +2847,9 @@ switch {
 .radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:inconsistent.button.flat, .radio.sidebar-button.button:inconsistent, .header-bar .radio.titlebutton.button:inconsistent,
-  .titlebar .radio.titlebutton.button:inconsistent {
+  .radio:inconsistent button.flat, .radio:inconsistent .sidebar-button.button, .radio:inconsistent .header-bar button.titlebutton, .header-bar .radio:inconsistent button.titlebutton,
+  .radio:inconsistent .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:inconsistent:selected, calendar.radio:inconsistent:selected,
@@ -3079,8 +2859,9 @@ switch {
 .radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover.png"), url("assets/radio-mixed-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:inconsistent:hover.button.flat, .radio.sidebar-button.button:inconsistent:hover, .header-bar .radio.titlebutton.button:inconsistent:hover,
-  .titlebar .radio.titlebutton.button:inconsistent:hover {
+  .radio:inconsistent:hover button.flat, .radio:inconsistent:hover .sidebar-button.button, .radio:inconsistent:hover .header-bar button.titlebutton, .header-bar .radio:inconsistent:hover button.titlebutton,
+  .radio:inconsistent:hover .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:hover button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:inconsistent:hover:selected, calendar.radio:inconsistent:hover:selected,
@@ -3090,8 +2871,9 @@ switch {
 .radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"), url("assets/radio-mixed-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:inconsistent:selected.button.flat, .radio.sidebar-button.button:inconsistent:selected, .header-bar .radio.titlebutton.button:inconsistent:selected,
-  .titlebar .radio.titlebutton.button:inconsistent:selected {
+  .radio:inconsistent:selected button.flat, .radio:inconsistent:selected .sidebar-button.button, .radio:inconsistent:selected .header-bar button.titlebutton, .header-bar .radio:inconsistent:selected button.titlebutton,
+  .radio:inconsistent:selected .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:selected button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:inconsistent:selected:selected, calendar.radio:inconsistent:selected,
@@ -3101,8 +2883,9 @@ switch {
 .radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop.png"), url("assets/radio-mixed-backdrop@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:backdrop, .header-bar .radio.titlebutton.button:inconsistent:backdrop,
-  .titlebar .radio.titlebutton.button:inconsistent:backdrop {
+  .radio:inconsistent:backdrop button.flat, .radio:inconsistent:backdrop .sidebar-button.button, .radio:inconsistent:backdrop .header-bar button.titlebutton, .header-bar .radio:inconsistent:backdrop button.titlebutton,
+  .radio:inconsistent:backdrop .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:inconsistent:backdrop:selected, calendar.radio:inconsistent:backdrop:selected,
@@ -3112,8 +2895,9 @@ switch {
 .radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:inconsistent:insensitive.button.flat, .radio.sidebar-button.button:inconsistent:insensitive, .header-bar .radio.titlebutton.button:inconsistent:insensitive,
-  .titlebar .radio.titlebutton.button:inconsistent:insensitive {
+  .radio:inconsistent:insensitive button.flat, .radio:inconsistent:insensitive .sidebar-button.button, .radio:inconsistent:insensitive .header-bar button.titlebutton, .header-bar .radio:inconsistent:insensitive button.titlebutton,
+  .radio:inconsistent:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:inconsistent:insensitive:selected, calendar.radio:inconsistent:insensitive:selected,
@@ -3123,8 +2907,9 @@ switch {
 .radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive.png"), url("assets/radio-mixed-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .radio:inconsistent:insensitive:backdrop.button.flat, .radio.sidebar-button.button:inconsistent:insensitive:backdrop, .header-bar .radio.titlebutton.button:inconsistent:insensitive:backdrop,
-  .titlebar .radio.titlebutton.button:inconsistent:insensitive:backdrop {
+  .radio:inconsistent:insensitive:backdrop button.flat, .radio:inconsistent:insensitive:backdrop .sidebar-button.button, .radio:inconsistent:insensitive:backdrop .header-bar button.titlebutton, .header-bar .radio:inconsistent:insensitive:backdrop button.titlebutton,
+  .radio:inconsistent:insensitive:backdrop .titlebar button.titlebutton,
+  .titlebar .radio:inconsistent:insensitive:backdrop button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:inconsistent:insensitive:backdrop:selected, calendar.radio:inconsistent:insensitive:backdrop:selected,
@@ -3134,8 +2919,9 @@ switch {
 .radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:checked.button.flat, .radio.sidebar-button.button:checked, .header-bar .radio.titlebutton.button:checked,
-  .titlebar .radio.titlebutton.button:checked {
+  .radio:checked button.flat, .radio:checked .sidebar-button.button, .radio:checked .header-bar button.titlebutton, .header-bar .radio:checked button.titlebutton,
+  .radio:checked .titlebar button.titlebutton,
+  .titlebar .radio:checked button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:checked:selected, calendar.radio:checked:selected,
@@ -3145,8 +2931,9 @@ switch {
 .radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:checked:insensitive.button.flat, .radio.sidebar-button.button:checked:insensitive, .header-bar .radio.titlebutton.button:checked:insensitive,
-  .titlebar .radio.titlebutton.button:checked:insensitive {
+  .radio:checked:insensitive button.flat, .radio:checked:insensitive .sidebar-button.button, .radio:checked:insensitive .header-bar button.titlebutton, .header-bar .radio:checked:insensitive button.titlebutton,
+  .radio:checked:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:checked:insensitive:selected, calendar.radio:checked:insensitive:selected,
@@ -3156,8 +2943,9 @@ switch {
 .radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover.png"), url("assets/radio-checked-hover@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:checked:hover.button.flat, .radio.sidebar-button.button:checked:hover, .header-bar .radio.titlebutton.button:checked:hover,
-  .titlebar .radio.titlebutton.button:checked:hover {
+  .radio:checked:hover button.flat, .radio:checked:hover .sidebar-button.button, .radio:checked:hover .header-bar button.titlebutton, .header-bar .radio:checked:hover button.titlebutton,
+  .radio:checked:hover .titlebar button.titlebutton,
+  .titlebar .radio:checked:hover button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:checked:hover:selected, calendar.radio:checked:hover:selected,
@@ -3167,8 +2955,9 @@ switch {
 .radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active.png"), url("assets/radio-checked-active@2.png"));
   icon-shadow: 0 1px 0 white; }
-  .radio:checked:active.button.flat, .radio.sidebar-button.button:checked:active, .header-bar .radio.titlebutton.button:checked:active,
-  .titlebar .radio.titlebutton.button:checked:active {
+  .radio:checked:active button.flat, .radio:checked:active .sidebar-button.button, .radio:checked:active .header-bar button.titlebutton, .header-bar .radio:checked:active button.titlebutton,
+  .radio:checked:active .titlebar button.titlebutton,
+  .titlebar .radio:checked:active button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:checked:active:selected, calendar.radio:checked:active:selected,
@@ -3178,8 +2967,9 @@ switch {
 .radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop.png"), url("assets/radio-checked-backdrop@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked.button.flat, .radio.sidebar-button.button:backdrop:checked, .header-bar .radio.titlebutton.button:backdrop:checked,
-  .titlebar .radio.titlebutton.button:backdrop:checked {
+  .radio:backdrop:checked button.flat, .radio:backdrop:checked .sidebar-button.button, .radio:backdrop:checked .header-bar button.titlebutton, .header-bar .radio:backdrop:checked button.titlebutton,
+  .radio:backdrop:checked .titlebar button.titlebutton,
+  .titlebar .radio:backdrop:checked button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:backdrop:checked:selected, calendar.radio:backdrop:checked:selected,
@@ -3189,8 +2979,9 @@ switch {
 .radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"), url("assets/radio-checked-backdrop-insensitive@2.png"));
   icon-shadow: none; }
-  .radio:backdrop:checked:insensitive.button.flat, .radio.sidebar-button.button:backdrop:checked:insensitive, .header-bar .radio.titlebutton.button:backdrop:checked:insensitive,
-  .titlebar .radio.titlebutton.button:backdrop:checked:insensitive {
+  .radio:backdrop:checked:insensitive button.flat, .radio:backdrop:checked:insensitive .sidebar-button.button, .radio:backdrop:checked:insensitive .header-bar button.titlebutton, .header-bar .radio:backdrop:checked:insensitive button.titlebutton,
+  .radio:backdrop:checked:insensitive .titlebar button.titlebutton,
+  .titlebar .radio:backdrop:checked:insensitive button.titlebutton {
     icon-shadow: none; }
 
 .view.radio:backdrop:checked:insensitive:selected, calendar.radio:backdrop:checked:insensitive:selected,
@@ -3208,7 +2999,7 @@ switch {
   .menu .menuitem.radio:hover {
     color: #ffffff; }
   .menu .menuitem.radio:insensitive {
-    color: #bdbebf; }
+    color: #bebfc0; }
 
 .view.check, .view.radio,
 .list-row .check, list-row .radio {
@@ -3262,7 +3053,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:inconsistent {
-    color: #8d9091; }
+    color: #8e9192; }
     GtkCheckButton.text-button:insensitive:backdrop, GtkCheckButton.text-button:insensitive:active:backdrop, GtkCheckButton.text-button:insensitive:inconsistent:backdrop, GtkRadioButton.text-button:insensitive:backdrop, GtkRadioButton.text-button:insensitive:active:backdrop, GtkRadioButton.text-button:insensitive:inconsistent:backdrop {
       color: #c7c7c7; }
 
@@ -3326,14 +3117,14 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #a0a0a0;
+      border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #ededed);
       box-shadow: none; }
     .scale.slider:backdrop:insensitive,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: #a8a8a8;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
@@ -3396,7 +3187,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     margin: 10px;
     border: 1px solid #a1a1a1;
     border-radius: 3px;
-    background-color: #cecece;
+    background-color: #cfcfcf;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
     .scale.trough.highlight,
     .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight,
@@ -3426,7 +3217,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.trough:backdrop,
     .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-      border-color: #a8a8a8;
+      border-color: darkgray;
       background-color: #c7c7c7;
       box-shadow: none; }
     .scale.trough:backdrop:insensitive, .scale.trough .highlight:backdrop:insensitive,
@@ -3434,7 +3225,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive {
-      border-color: #a8a8a8;
+      border-color: darkgray;
       background-color: #f4f4f4; }
     .osd .scale.trough, .osd
     .scale.scale-has-marks-above.scale-has-marks-below.trough, .osd
@@ -3489,14 +3280,14 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
       border-color: #4a90d9;
       box-shadow: none;
-      background-color: #a4c7ec;
+      background-color: #a5c8ec;
       background-image: none; }
       .list-row:selected .scale:insensitive:backdrop, .list-row:selected .scale.trough.highlight:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop, .list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop {
-        background-color: #a4c7ec; }
+        background-color: #a5c8ec; }
 
 .scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
@@ -3753,8 +3544,8 @@ GtkProgressBar {
     border-radius: 3px;
     background-color: #d2d2d2; }
     GtkProgressBar.trough:backdrop {
-      border-color: #a8a8a8;
-      background-color: #d4d4d4;
+      border-color: darkgray;
+      background-color: #d5d5d5;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
     GtkProgressBar.trough.osd {
       border-style: none;
@@ -3816,8 +3607,8 @@ GtkProgressBar {
     .level-bar.trough:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
-      color: #323232;
-      border-color: #a8a8a8;
+      color: #333333;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, white);
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .level-bar.fill-block {
@@ -3847,7 +3638,7 @@ GtkProgressBar {
       border-color: rgba(46, 52, 54, 0.2);
       box-shadow: none; }
       .level-bar.fill-block.empty-fill-block:backdrop {
-        border-color: rgba(141, 144, 145, 0.15); }
+        border-color: rgba(142, 145, 146, 0.15); }
 
 /**********
  * Frames *
@@ -3858,7 +3649,7 @@ GtkProgressBar {
   .frame.flat {
     border-style: none; }
   .frame:backdrop {
-    border-color: #a8a8a8; }
+    border-color: darkgray; }
   .frame.action-bar {
     padding: 6px;
     border-width: 1px 0 0; }
@@ -3879,7 +3670,7 @@ separator {
   border-color: #a1a1a1; }
   .list:backdrop {
     background-color: white;
-    border-color: #a8a8a8; }
+    border-color: darkgray; }
 
 .list-row,
 .grid-child {
@@ -3894,11 +3685,11 @@ separator {
 .list-row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 .list-row.activatable:selected.has-open-popup, .list-row.activatable:selected:hover {
-  background-color: #4786c8; }
+  background-color: #4787c9; }
 .list-row.activatable:selected:backdrop {
   background-color: #4a90d9; }
 
-.list-row:selected .button {
+.list-row:selected button {
   color: #2e3436;
   outline-color: rgba(46, 52, 54, 0.3);
   border-color: #a1a1a1;
@@ -3907,9 +3698,9 @@ separator {
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white;
   border-color: #184472; }
-  .list-row:selected .button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar .titlebutton.button, .header-bar .list-row:selected .titlebutton.button,
-  .list-row:selected .titlebar .titlebutton.button,
-  .titlebar .list-row:selected .titlebutton.button {
+  .list-row:selected button.flat, .list-row:selected .sidebar-button.button, .list-row:selected .header-bar button.titlebutton, .header-bar .list-row:selected button.titlebutton,
+  .list-row:selected .titlebar button.titlebutton,
+  .titlebar .list-row:selected button.titlebutton {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -3917,7 +3708,7 @@ separator {
     text-shadow: none;
     icon-shadow: none;
     color: #ffffff; }
-  .list-row:selected .button:hover {
+  .list-row:selected button:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -3926,7 +3717,7 @@ separator {
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white;
     border-color: #184472; }
-  .list-row:selected .button:active, .list-row:selected .button:checked {
+  .list-row:selected button:active, .list-row:selected button:checked {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -3935,59 +3726,62 @@ separator {
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6);
     border-color: #184472; }
-  .list-row:selected .button:backdrop, .list-row:selected .button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.button:backdrop,
-  .list-row:selected .titlebar .titlebutton.button:backdrop,
-  .titlebar .list-row:selected .titlebutton.button:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
+  .list-row:selected button:backdrop, .list-row:selected button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, .list-row:selected .header-bar button.titlebutton:backdrop, .header-bar .list-row:selected button.titlebutton:backdrop,
+  .list-row:selected .titlebar button.titlebutton:backdrop,
+  .titlebar .list-row:selected button.titlebutton:backdrop {
+    color: #8e9192;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    .list-row:selected .button:backdrop:active, .list-row:selected .button:backdrop:checked, .list-row:selected .button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, .list-row:selected .header-bar .titlebutton.button:backdrop:active, .header-bar .list-row:selected .titlebutton.button:backdrop:active,
-    .list-row:selected .titlebar .titlebutton.button:backdrop:active,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:active, .list-row:selected .button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:checked,
-    .list-row:selected .titlebar .titlebutton.button:backdrop:checked,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:checked {
-      color: #8d9091;
-      border-color: #a8a8a8;
-      background-image: linear-gradient(to bottom, #d4d4d4);
+    .list-row:selected button:backdrop:active, .list-row:selected button:backdrop:checked, .list-row:selected button.flat:backdrop:active, .list-row:selected .sidebar-button.button:backdrop:active, .list-row:selected .header-bar button.titlebutton:backdrop:active, .header-bar .list-row:selected button.titlebutton:backdrop:active,
+    .list-row:selected .titlebar button.titlebutton:backdrop:active,
+    .titlebar .list-row:selected button.titlebutton:backdrop:active, .list-row:selected button.flat:backdrop:checked, .list-row:selected .sidebar-button.button:backdrop:checked, .list-row:selected .header-bar button.titlebutton:backdrop:checked, .header-bar .list-row:selected button.titlebutton:backdrop:checked,
+    .list-row:selected .titlebar button.titlebutton:backdrop:checked,
+    .titlebar .list-row:selected button.titlebutton:backdrop:checked {
+      color: #8e9192;
+      border-color: darkgray;
+      background-image: linear-gradient(to bottom, #d5d5d5);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
-    .list-row:selected .button:backdrop:insensitive, .list-row:selected .button.flat:backdrop:insensitive, .list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive,
-    .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive,
-    .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive {
+    .list-row:selected button:backdrop:insensitive, .list-row:selected button.flat:backdrop:insensitive, .list-row:selected .sidebar-button.button:backdrop:insensitive, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive,
+    .list-row:selected .titlebar button.titlebutton:backdrop:insensitive,
+    .titlebar .list-row:selected button.titlebutton:backdrop:insensitive {
       color: #c7c7c7;
-      border-color: #a8a8a8;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
-      .list-row:selected .button:backdrop:insensitive > .label, .list-row:selected .button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive > .label,
-      .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive > .label,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive > .label {
+      .list-row:selected button:backdrop:insensitive > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label, .list-row:selected button.flat:backdrop:insensitive > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive > .label, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive > .label,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive > .label,
+      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive > .label {
         color: inherit; }
-      .list-row:selected .button:backdrop:insensitive:active, .list-row:selected .button:backdrop:insensitive:checked, .list-row:selected .button.flat:backdrop:insensitive:active, .list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active,
-      .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active, .list-row:selected .button.flat:backdrop:insensitive:checked, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked,
-      .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked,
-      .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked {
+      .list-row:selected button:backdrop:insensitive:active, .list-row:selected button:backdrop:insensitive:checked, .list-row:selected button.flat:backdrop:insensitive:active, .list-row:selected .sidebar-button.button:backdrop:insensitive:active, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:active, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive:active,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active,
+      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active, .list-row:selected button.flat:backdrop:insensitive:checked, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:checked, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive:checked,
+      .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked,
+      .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:checked {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         background-image: linear-gradient(to bottom, #e7e7e7);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #184472; }
-        .list-row:selected .button:backdrop:insensitive:active > .label, .list-row:selected .button:backdrop:insensitive:checked > .label, .list-row:selected .button.flat:backdrop:insensitive:active > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:active > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label,
-        .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:active > .label,
-        .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:active > .label, .list-row:selected .button.flat:backdrop:insensitive:checked > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar .titlebutton.button:backdrop:insensitive:checked > .label, .header-bar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label,
-        .list-row:selected .titlebar .titlebutton.button:backdrop:insensitive:checked > .label,
-        .titlebar .list-row:selected .titlebutton.button:backdrop:insensitive:checked > .label {
+        .list-row:selected button:backdrop:insensitive:active > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label, .list-row:selected button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:checked > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label, .list-row:selected button.flat:backdrop:insensitive:active > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive:active > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:active > .label, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive:active > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:active > .label,
+        .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:active > .label, .list-row:selected button.flat:backdrop:insensitive:checked > .label, .list-row:selected .sidebar-button.button:backdrop:insensitive:checked > .label, .list-row:selected .header-bar button.titlebutton:backdrop:insensitive:checked > .label, .header-bar .list-row:selected button.titlebutton:backdrop:insensitive:checked > .label,
+        .list-row:selected .titlebar button.titlebutton:backdrop:insensitive:checked > .label,
+        .titlebar .list-row:selected button.titlebutton:backdrop:insensitive:checked > .label {
           color: inherit; }
-  .list-row:selected .button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, .list-row:selected .header-bar .titlebutton.button:backdrop, .header-bar .list-row:selected .titlebutton.button:backdrop,
-  .list-row:selected .titlebar .titlebutton.button:backdrop,
-  .titlebar .list-row:selected .titlebutton.button:backdrop {
+  .list-row:selected button.flat:backdrop, .list-row:selected .sidebar-button.button:backdrop, .list-row:selected .header-bar button.titlebutton:backdrop, .header-bar .list-row:selected button.titlebutton:backdrop,
+  .list-row:selected .titlebar button.titlebutton:backdrop,
+  .titlebar .list-row:selected button.titlebutton:backdrop {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -3995,22 +3789,25 @@ separator {
     text-shadow: none;
     icon-shadow: none;
     color: white; }
-  .list-row:selected .button:insensitive {
-    color: #8d9091;
+  .list-row:selected button:insensitive {
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    .list-row:selected .button:insensitive > .label {
+    .list-row:selected button:insensitive > .label, .list-row:selected .header-bar button.titlebutton:insensitive > .label,
+    .list-row:selected .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
-    .list-row:selected .button:insensitive:active, .list-row:selected .button:insensitive:checked {
-      color: #8d9091;
+    .list-row:selected button:insensitive:active, .list-row:selected button:insensitive:checked {
+      color: #8e9192;
       border-color: #a1a1a1;
-      background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
+      background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .list-row:selected .button:insensitive:active > .label, .list-row:selected .button:insensitive:checked > .label {
+      .list-row:selected button:insensitive:active > .label, .list-row:selected .header-bar button.titlebutton:insensitive:active > .label,
+      .list-row:selected .titlebar button.titlebutton:insensitive:active > .label, .list-row:selected button:insensitive:checked > .label, .list-row:selected .header-bar button.titlebutton:insensitive:checked > .label,
+      .list-row:selected .titlebar button.titlebutton:insensitive:checked > .label {
         color: inherit; }
 
 .list-row {
@@ -4032,10 +3829,10 @@ separator {
   .app-notification:backdrop,
   .app-notification.frame:backdrop {
     background-image: none; }
-  .app-notification .button, .app-notification .header-bar .button.titlebutton, .header-bar .app-notification .button.titlebutton,
-  .app-notification .titlebar .button.titlebutton,
-  .titlebar .app-notification .button.titlebutton,
-  .app-notification.frame .button {
+  .app-notification button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification button.titlebutton,
+  .app-notification .titlebar button.titlebutton,
+  .titlebar .app-notification button.titlebutton,
+  .app-notification.frame button {
     color: #eeeeec;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -4044,19 +3841,19 @@ separator {
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
-    .app-notification .titlebar .titlebutton.button,
-    .titlebar .app-notification .titlebutton.button,
-    .app-notification.frame .button.flat,
+    .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification .header-bar button.titlebutton, .header-bar .app-notification button.titlebutton,
+    .app-notification .titlebar button.titlebutton,
+    .titlebar .app-notification button.titlebutton,
+    .app-notification.frame button.flat,
     .app-notification.frame .sidebar-button.button,
-    .app-notification.frame .header-bar .titlebutton.button,
-    .header-bar .app-notification.frame .titlebutton.button,
-    .app-notification.frame .titlebar .titlebutton.button,
-    .titlebar .app-notification.frame .titlebutton.button {
+    .app-notification.frame .header-bar button.titlebutton,
+    .header-bar .app-notification.frame button.titlebutton,
+    .app-notification.frame .titlebar button.titlebutton,
+    .titlebar .app-notification.frame button.titlebutton {
       icon-shadow: 0 1px black;
       text-shadow: 0 1px black; }
-    .app-notification .button:hover,
-    .app-notification.frame .button:hover {
+    .app-notification button:hover,
+    .app-notification.frame button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -4065,11 +3862,11 @@ separator {
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button:active, .app-notification .button:checked, .app-notification .button:backdrop:active, .app-notification .button:backdrop:checked,
-    .app-notification.frame .button:active,
-    .app-notification.frame .button:checked,
-    .app-notification.frame .button:backdrop:active,
-    .app-notification.frame .button:backdrop:checked {
+    .app-notification button:active, .app-notification button:checked, .app-notification button:backdrop:active, .app-notification button:backdrop:checked,
+    .app-notification.frame button:active,
+    .app-notification.frame button:checked,
+    .app-notification.frame button:backdrop:active,
+    .app-notification.frame button:backdrop:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -4078,18 +3875,18 @@ separator {
       text-shadow: none;
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
-    .app-notification.frame .button:insensitive,
-    .app-notification.frame .button:backdrop:insensitive {
-      color: #878989;
+    .app-notification button:insensitive, .app-notification button:backdrop:insensitive,
+    .app-notification.frame button:insensitive,
+    .app-notification.frame button:backdrop:insensitive {
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .app-notification .button:backdrop,
-    .app-notification.frame .button:backdrop {
+    .app-notification button:backdrop,
+    .app-notification.frame button:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -4121,31 +3918,27 @@ calendar {
     border-radius: 0; }
     calendar.header:backdrop {
       border-color: rgba(0, 0, 0, 0.1); }
-  calendar.button, .header-bar calendar.button.titlebutton,
-  .titlebar calendar.button.titlebutton {
+  calendar.button {
     color: rgba(46, 52, 54, 0.45); }
-    calendar.button:hover, .header-bar calendar.button.titlebutton:hover,
-    .titlebar calendar.button.titlebutton:hover {
+    calendar.button:hover {
       color: #2e3436; }
-    calendar.button:backdrop, .header-bar calendar.button.titlebutton:backdrop,
-    .titlebar calendar.button.titlebutton:backdrop {
-      color: rgba(141, 144, 145, 0.45); }
-    calendar.button:insensitive, .header-bar calendar.button.titlebutton:insensitive,
-    .titlebar calendar.button.titlebutton:insensitive {
-      color: rgba(141, 144, 145, 0.45); }
+    calendar.button:backdrop {
+      color: rgba(142, 145, 146, 0.45); }
+    calendar.button:insensitive {
+      color: rgba(142, 145, 146, 0.45); }
   calendar:inconsistent, calendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #2e3436; }
   calendar:backdrop {
-    color: #323232;
-    border-color: #a8a8a8; }
+    color: #333333;
+    border-color: darkgray; }
 
 /***********
  * Dialogs *
  ***********/
-.message-dialog .dialog-action-area .button {
+.message-dialog .dialog-action-area button {
   padding: 8px; }
 
 .message-dialog.background {
@@ -4156,7 +3949,7 @@ calendar {
 .message-dialog.csd.background {
   border-bottom-left-radius: 9px;
   border-bottom-right-radius: 9px; }
-.message-dialog.csd .dialog-action-area .button {
+.message-dialog.csd .dialog-action-area button {
   padding: 12px;
   border-radius: 0;
   color: #2e3436;
@@ -4166,7 +3959,7 @@ calendar {
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white; }
-  .message-dialog.csd .dialog-action-area .button:hover {
+  .message-dialog.csd .dialog-action-area button:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -4174,7 +3967,7 @@ calendar {
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white; }
-  .message-dialog.csd .dialog-action-area .button:active {
+  .message-dialog.csd .dialog-action-area button:active {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -4182,32 +3975,34 @@ calendar {
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-  .message-dialog.csd .dialog-action-area .button:insensitive {
-    color: #8d9091;
+  .message-dialog.csd .dialog-action-area button:insensitive {
+    color: #8e9192;
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area .button:insensitive > .label {
+    .message-dialog.csd .dialog-action-area button:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.titlebutton:insensitive > .label,
+    .message-dialog.csd .dialog-action-area .titlebar button.titlebutton:insensitive > .label {
       color: inherit; }
-  .message-dialog.csd .dialog-action-area .button:backdrop {
-    color: #8d9091;
-    border-color: #a8a8a8;
+  .message-dialog.csd .dialog-action-area button:backdrop {
+    color: #8e9192;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-  .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
+  .message-dialog.csd .dialog-action-area button:backdrop:insensitive {
     color: #c7c7c7;
-    border-color: #a8a8a8;
+    border-color: darkgray;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label {
+    .message-dialog.csd .dialog-action-area button:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.titlebutton:backdrop:insensitive > .label,
+    .message-dialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:insensitive > .label {
       color: inherit; }
-  .message-dialog.csd .dialog-action-area .button.suggested-action {
+  .message-dialog.csd .dialog-action-area button.suggested-action {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #1c5187;
@@ -4215,7 +4010,7 @@ calendar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-    .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
+    .message-dialog.csd .dialog-action-area button.suggested-action:hover {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #1c5187;
@@ -4223,7 +4018,7 @@ calendar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-    .message-dialog.csd .dialog-action-area .button.suggested-action:active {
+    .message-dialog.csd .dialog-action-area button.suggested-action:active {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #1c5187;
@@ -4231,32 +4026,34 @@ calendar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-    .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
-      color: #dae8f7;
+    .message-dialog.csd .dialog-action-area button.suggested-action:backdrop {
+      color: #dbe9f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
+      .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive > .label {
+        .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.suggested-action.titlebutton:backdrop:insensitive > .label,
+        .message-dialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-    .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
-      color: #8d9091;
+    .message-dialog.csd .dialog-action-area button.suggested-action:insensitive {
+      color: #8e9192;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive > .label {
+      .message-dialog.csd .dialog-action-area button.suggested-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.suggested-action.titlebutton:insensitive > .label,
+      .message-dialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:insensitive > .label {
         color: inherit; }
-  .message-dialog.csd .dialog-action-area .button.destructive-action {
+  .message-dialog.csd .dialog-action-area button.destructive-action {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #8e0b0b;
@@ -4264,7 +4061,7 @@ calendar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-    .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
+    .message-dialog.csd .dialog-action-area button.destructive-action:hover {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #8e0b0b;
@@ -4272,7 +4069,7 @@ calendar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-    .message-dialog.csd .dialog-action-area .button.destructive-action:active {
+    .message-dialog.csd .dialog-action-area button.destructive-action:active {
       color: white;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #8e0b0b;
@@ -4280,39 +4077,41 @@ calendar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-    .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
-      color: #fbd4d4;
+    .message-dialog.csd .dialog-action-area button.destructive-action:backdrop {
+      color: #fcd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
+      .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive {
         color: #c7c7c7;
-        border-color: #a8a8a8;
+        border-color: darkgray;
         background-image: linear-gradient(to bottom, #f4f4f4);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive > .label {
+        .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.destructive-action.titlebutton:backdrop:insensitive > .label,
+        .message-dialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
-    .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
-      color: #8d9091;
+    .message-dialog.csd .dialog-action-area button.destructive-action:insensitive {
+      color: #8e9192;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive > .label {
+      .message-dialog.csd .dialog-action-area button.destructive-action:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar button.destructive-action.titlebutton:insensitive > .label,
+      .message-dialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:insensitive > .label {
         color: inherit; }
-.message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
+.message-dialog.csd .dialog-action-area button, .message-dialog.csd .dialog-action-area button:hover, .message-dialog.csd .dialog-action-area button:active, .message-dialog.csd .dialog-action-area button:insensitive, .message-dialog.csd .dialog-action-area button:backdrop, .message-dialog.csd .dialog-action-area button:backdrop:insensitive, .message-dialog.csd .dialog-action-area button.suggested-action, .message-dialog.csd .dialog-action-area button.suggested-action:hover, .message-dialog.csd .dialog-action-area button.suggested-action:active, .message-dialog.csd .dialog-action-area button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area button.destructive-action, .message-dialog.csd .dialog-action-area button.destructive-action:hover, .message-dialog.csd .dialog-action-area button.destructive-action:active, .message-dialog.csd .dialog-action-area button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area button.destructive-action:insensitive {
   border-left-style: solid;
   border-right-style: none;
   border-bottom-style: none; }
-.message-dialog.csd .dialog-action-area .button:last-child {
+.message-dialog.csd .dialog-action-area button:last-child {
   border-bottom-right-radius: 7px;
   outline-bottom-right-radius: 5px; }
-.message-dialog.csd .dialog-action-area .button:first-child {
+.message-dialog.csd .dialog-action-area button:first-child {
   border-left-style: none;
   border-bottom-left-radius: 7px;
   outline-bottom-left-radius: 5px; }
@@ -4327,7 +4126,7 @@ GtkFileChooserDialog .search-bar {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #a1a1a1; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #a8a8a8; }
+    border-top-color: darkgray; }
 
 /***********
  * Sidebar *
@@ -4359,13 +4158,12 @@ GtkPlacesSidebar.sidebar .sidebar-placeholder-row {
   border: solid 1px #4a90d9; }
 GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
   color: #4a90d9; }
-.sidebar-button.button, .header-bar .sidebar-button.button.titlebutton,
-.titlebar .sidebar-button.button.titlebutton {
+.sidebar-button.button {
   border-radius: 100%;
   outline-radius: 100%; }
   .sidebar-button.button.image-button, GtkScaleButton.sidebar-button.button,
-  GtkVolumeButton.sidebar-button.button, .header-bar .sidebar-button.titlebutton.button,
-  .titlebar .sidebar-button.titlebutton.button {
+  GtkVolumeButton.sidebar-button.button, .header-bar button.sidebar-button.button.titlebutton,
+  .titlebar button.sidebar-button.button.titlebutton {
     padding: 5px; }
   .sidebar-button.button:not(:hover):not(:active) > image, .sidebar-button.button:backdrop > image {
     opacity: 0.7; }
@@ -4403,7 +4201,7 @@ GtkPaned {
   GtkPaned .pane-separator {
     background-color: #a1a1a1; }
     GtkPaned .pane-separator:backdrop {
-      background-color: #a8a8a8; }
+      background-color: darkgray; }
 
 GtkPaned.wide {
   -GtkPaned-handle-size: 5;
@@ -4416,7 +4214,7 @@ GtkPaned.wide {
   GtkPaned.wide.vertical .pane-separator {
     border-style: solid none; }
   GtkPaned.wide .pane-separator:backdrop {
-    border-color: #a8a8a8; }
+    border-color: darkgray; }
 
 /**************
  * GtkInfoBar *
@@ -4432,24 +4230,24 @@ infobar {
   color: #ffffff;
   text-shadow: 0 1px #2a76c6;
   border-color: #2a76c6; }
-  .info .button, .info .header-bar .button.titlebutton, .header-bar .info .button.titlebutton,
-  .info .titlebar .button.titlebutton,
-  .titlebar .info .button.titlebutton,
-  .question .button,
-  .question .header-bar .button.titlebutton,
-  .header-bar .question .button.titlebutton,
-  .question .titlebar .button.titlebutton,
-  .titlebar .question .button.titlebutton,
-  .warning .button,
-  .warning .header-bar .button.titlebutton,
-  .header-bar .warning .button.titlebutton,
-  .warning .titlebar .button.titlebutton,
-  .titlebar .warning .button.titlebutton,
-  .error .button,
-  .error .header-bar .button.titlebutton,
-  .header-bar .error .button.titlebutton,
-  .error .titlebar .button.titlebutton,
-  .titlebar .error .button.titlebutton {
+  .info button, .info .header-bar button.titlebutton, .header-bar .info button.titlebutton,
+  .info .titlebar button.titlebutton,
+  .titlebar .info button.titlebutton,
+  .question button,
+  .question .header-bar button.titlebutton,
+  .header-bar .question button.titlebutton,
+  .question .titlebar button.titlebutton,
+  .titlebar .question button.titlebutton,
+  .warning button,
+  .warning .header-bar button.titlebutton,
+  .header-bar .warning button.titlebutton,
+  .warning .titlebar button.titlebutton,
+  .titlebar .warning button.titlebutton,
+  .error button,
+  .error .header-bar button.titlebutton,
+  .header-bar .error button.titlebutton,
+  .error .titlebar button.titlebutton,
+  .titlebar .error button.titlebutton {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #1c5187;
@@ -4457,10 +4255,10 @@ infobar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-    .info .button:hover,
-    .question .button:hover,
-    .warning .button:hover,
-    .error .button:hover {
+    .info button:hover,
+    .question button:hover,
+    .warning button:hover,
+    .error button:hover {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #1c5187;
@@ -4468,10 +4266,10 @@ infobar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.51153);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.5); }
-    .info .button:active,
-    .question .button:active,
-    .warning .button:active,
-    .error .button:active {
+    .info button:active,
+    .question button:active,
+    .warning button:active,
+    .error button:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #1c5187;
@@ -4479,47 +4277,61 @@ infobar {
       text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
-    .info .button:insensitive,
-    .question .button:insensitive,
-    .warning .button:insensitive,
-    .error .button:insensitive {
-      color: #b2cfee;
+    .info button:insensitive,
+    .question button:insensitive,
+    .warning button:insensitive,
+    .error button:insensitive {
+      color: #b2d0ef;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #65a0de);
+      background-image: linear-gradient(to bottom, #65a1df);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info .button:insensitive > .label,
-      .question .button:insensitive > .label,
-      .warning .button:insensitive > .label,
-      .error .button:insensitive > .label {
+      .info button:insensitive > .label, .info .header-bar button.titlebutton:insensitive > .label,
+      .info .titlebar button.titlebutton:insensitive > .label,
+      .question button:insensitive > .label,
+      .question .header-bar button.titlebutton:insensitive > .label,
+      .question .titlebar button.titlebutton:insensitive > .label,
+      .warning button:insensitive > .label,
+      .warning .header-bar button.titlebutton:insensitive > .label,
+      .warning .titlebar button.titlebutton:insensitive > .label,
+      .error button:insensitive > .label,
+      .error .header-bar button.titlebutton:insensitive > .label,
+      .error .titlebar button.titlebutton:insensitive > .label {
         color: inherit; }
-    .info .button:backdrop,
-    .question .button:backdrop,
-    .warning .button:backdrop,
-    .error .button:backdrop {
-      color: #dae8f7;
+    .info button:backdrop,
+    .question button:backdrop,
+    .warning button:backdrop,
+    .error button:backdrop {
+      color: #dbe9f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #1c5187; }
-      .info .button:backdrop:insensitive,
-      .question .button:backdrop:insensitive,
-      .warning .button:backdrop:insensitive,
-      .error .button:backdrop:insensitive {
-        color: #9ac1e9;
-        border-color: #65a0de;
-        background-image: linear-gradient(to bottom, #65a0de);
+      .info button:backdrop:insensitive,
+      .question button:backdrop:insensitive,
+      .warning button:backdrop:insensitive,
+      .error button:backdrop:insensitive {
+        color: #9bc2ea;
+        border-color: #65a1df;
+        background-image: linear-gradient(to bottom, #65a1df);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #1c5187; }
-        .info .button:backdrop:insensitive > .label,
-        .question .button:backdrop:insensitive > .label,
-        .warning .button:backdrop:insensitive > .label,
-        .error .button:backdrop:insensitive > .label {
+        .info button:backdrop:insensitive > .label, .info .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .info .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .question button:backdrop:insensitive > .label,
+        .question .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .question .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .warning button:backdrop:insensitive > .label,
+        .warning .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .warning .titlebar button.titlebutton:backdrop:insensitive > .label,
+        .error button:backdrop:insensitive > .label,
+        .error .header-bar button.titlebutton:backdrop:insensitive > .label,
+        .error .titlebar button.titlebutton:backdrop:insensitive > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4643,8 +4455,8 @@ GtkColorSwatch {
       icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white, 0 1px white; }
     GtkColorSwatch#add-color-button:backdrop {
-      color: #8d9091;
-      border-color: #a8a8a8;
+      color: #8e9192;
+      border-color: darkgray;
       background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
@@ -4667,17 +4479,17 @@ GtkColorSwatch {
   .content-view:backdrop {
     background-color: #dbdbdb; }
 
-.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
-.osd .scale-popup .titlebar .titlebutton.button,
-.titlebar .osd .scale-popup .titlebutton.button {
+.osd .scale-popup button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar button.titlebutton, .header-bar .osd .scale-popup button.titlebutton,
+.osd .scale-popup .titlebar button.titlebutton,
+.titlebar .osd .scale-popup button.titlebutton {
   padding: 6px;
   border-style: none;
   border-radius: 5px; }
-.scale-popup .button, .scale-popup .header-bar .button.titlebutton, .header-bar .scale-popup .button.titlebutton,
-.scale-popup .titlebar .button.titlebutton,
-.titlebar .scale-popup .button.titlebutton {
+.scale-popup button, .scale-popup .header-bar button.titlebutton, .header-bar .scale-popup button.titlebutton,
+.scale-popup .titlebar button.titlebutton,
+.titlebar .scale-popup button.titlebutton {
   padding: 6px; }
-  .scale-popup .button:hover {
+  .scale-popup button:hover {
     background-color: rgba(46, 52, 54, 0.1);
     border-radius: 5px; }
 
@@ -4711,38 +4523,34 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #ededed;
-    border: solid 1px #a8a8a8;
+    border: solid 1px darkgray;
     box-shadow: none; }
 
-.header-bar .titlebutton.button,
-.titlebar .titlebutton.button {
+.header-bar button.titlebutton,
+.titlebar button.titlebutton {
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
-  .header-bar .titlebutton.button:backdrop,
-  .titlebar .titlebutton.button:backdrop {
+  .header-bar button.titlebutton:backdrop,
+  .titlebar button.titlebutton:backdrop {
     icon-shadow: none; }
 
-.header-bar.selection-mode .titlebutton.button,
-.titlebar.selection-mode .titlebutton.button {
+.header-bar.selection-mode button.titlebutton,
+.titlebar.selection-mode button.titlebutton {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353); }
-  .header-bar.selection-mode .titlebutton.button:backdrop,
-  .titlebar.selection-mode .titlebutton.button:backdrop {
+  .header-bar.selection-mode button.titlebutton:backdrop,
+  .titlebar.selection-mode button.titlebutton:backdrop {
     icon-shadow: none; }
 
-.view:selected, calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, entry:selected:focus, spinbutton:selected, spinbutton:selected:focus, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .header-bar .menuitem.titlebutton.button:selected,
-.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected {
+.view:selected, calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, entry:selected:focus, spinbutton:selected, spinbutton:selected:focus, .menuitem.button.flat:selected, .list-row:selected, .sidebar:selected {
   background-color: #4a90d9;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  .view:insensitive:selected, calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, .menuitem.button.flat:insensitive:selected, .menuitem.sidebar-button.button:insensitive:selected, .header-bar .menuitem.titlebutton.button:insensitive:selected,
-  .titlebar .menuitem.titlebutton.button:insensitive:selected, .list-row:insensitive:selected, .sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label {
-    color: #a4c7ec; }
-  .view:backdrop:selected, calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, .menuitem.button.flat:backdrop:selected, .menuitem.sidebar-button.button:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
-  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected {
+  .view:insensitive:selected, calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, .menuitem.button.flat:insensitive:selected, .list-row:insensitive:selected, .sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label {
+    color: #a5c8ec; }
+  .view:backdrop:selected, calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, .menuitem.button.flat:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected {
     color: #ffffff; }
-    .view:backdrop:insensitive:selected, calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, .menuitem.sidebar-button.button:backdrop:insensitive:selected, .header-bar .menuitem.titlebutton.button:backdrop:insensitive:selected,
-    .titlebar .menuitem.titlebutton.button:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label:backdrop, GtkPlacesSidebar.sidebar .list-row:selected:backdrop:insensitive label {
+    .view:backdrop:insensitive:selected, calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label:backdrop, GtkPlacesSidebar.sidebar .list-row:selected:backdrop:insensitive label {
       color: #80b1e4; }
 
 .monospace {
@@ -4816,9 +4624,9 @@ entry.cursor-handle,
   icon-shadow: 0 1px black; }
   .touch-selection:backdrop {
     text-shadow: none; }
-  .touch-selection .button, .touch-selection .header-bar .button.titlebutton, .header-bar .touch-selection .button.titlebutton,
-  .touch-selection .titlebar .button.titlebutton,
-  .titlebar .touch-selection .button.titlebutton {
+  .touch-selection button, .touch-selection .header-bar button.titlebutton, .header-bar .touch-selection button.titlebutton,
+  .touch-selection .titlebar button.titlebutton,
+  .titlebar .touch-selection button.titlebutton {
     color: #eeeeec;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -4827,7 +4635,7 @@ entry.cursor-handle,
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     outline-color: rgba(238, 238, 236, 0.3); }
-    .touch-selection .button:hover {
+    .touch-selection button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -4836,7 +4644,7 @@ entry.cursor-handle,
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .touch-selection .button:active, .touch-selection .button:checked {
+    .touch-selection button:active, .touch-selection button:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -4845,15 +4653,15 @@ entry.cursor-handle,
       text-shadow: none;
       icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
-    .touch-selection .button:insensitive, .touch-selection .button:backdrop:insensitive {
-      color: #878989;
+    .touch-selection button:insensitive, .touch-selection button:backdrop:insensitive {
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
-    .touch-selection .button:backdrop {
+    .touch-selection button:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -4949,7 +4757,7 @@ entry.cursor-handle,
   border: none;
   box-shadow: none; }
   .overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(darkgray), to(rgba(169, 169, 169, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -4965,7 +4773,7 @@ entry.cursor-handle,
   border: none;
   box-shadow: none; }
   .overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(darkgray), to(rgba(169, 169, 169, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -4981,7 +4789,7 @@ entry.cursor-handle,
   border: none;
   box-shadow: none; }
   .overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(darkgray), to(rgba(169, 169, 169, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -4997,7 +4805,7 @@ entry.cursor-handle,
   border: none;
   box-shadow: none; }
   .overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a8a8a8), to(rgba(168, 168, 168, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(darkgray), to(rgba(169, 169, 169, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -5038,13 +4846,13 @@ entry.cursor-handle,
   background-origin: content-box;
   background-position: right center; }
 
-.button.circular, .header-bar .circular.button.titlebutton,
-.titlebar .circular.button.titlebutton {
+button.circular, .header-bar button.circular.titlebutton,
+.titlebar button.circular.titlebutton {
   border-radius: 20px;
   outline-radius: 20px; }
 
-.button.circular label, .header-bar .circular.button.titlebutton label,
-.titlebar .circular.button.titlebutton label {
+button.circular label, .header-bar button.circular.titlebutton label,
+.titlebar button.circular.titlebutton label {
   padding: 0; }
 
 .frame.keycap {
@@ -5081,13 +4889,13 @@ base background color of insensitive widgets */
 @define-color insensitive_bg_color #f4f4f4;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #8d9091;
+@define-color insensitive_fg_color #8e9192;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #ffffff;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #8d9091;
+@define-color theme_unfocused_fg_color #8e9192;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color black;
@@ -5108,7 +4916,7 @@ widgets main borders color */
 @define-color borders #a1a1a1;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #a8a8a8;
+@define-color unfocused_borders darkgray;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -5118,7 +4926,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#2e3436, 1.8);
-@define-color wm_unfocused_title #8d9091;
+@define-color wm_unfocused_title #8e9192;
 @define-color wm_highlight white;
 @define-color wm_borders_edge white;
 @define-color wm_bg_a shade(#ededed, 1.2);